[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117670: * dired.c (Ffile_attributes): Return Qni
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs-24 r117670: * dired.c (Ffile_attributes): Return Qnil, if Fexpand_file_name |
Date: |
Wed, 05 Nov 2014 11:23:14 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117670
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18891
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-11-05 12:23:10 +0100
message:
* dired.c (Ffile_attributes): Return Qnil, if Fexpand_file_name
raises an error.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/dired.c dired.c-20091113204419-o5vbwnq5f7feedwu-171
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-11-03 17:14:50 +0000
+++ b/src/ChangeLog 2014-11-05 11:23:10 +0000
@@ -1,3 +1,8 @@
+2014-11-05 Michael Albinus <address@hidden>
+
+ * dired.c (Ffile_attributes): Return Qnil, if Fexpand_file_name
+ raises an error. (Bug#18891)
+
2014-11-03 Eli Zaretskii <address@hidden>
* xdisp.c (Fdump_glyph_matrix, Fdump_frame_glyph_matrix): Doc fix.
=== modified file 'src/dired.c'
--- a/src/dired.c 2014-08-02 22:58:09 +0000
+++ b/src/dired.c 2014-11-05 11:23:10 +0000
@@ -909,7 +909,10 @@
Lisp_Object encoded;
Lisp_Object handler;
- filename = Fexpand_file_name (filename, Qnil);
+ filename = internal_condition_case_2 (Fexpand_file_name, filename, Qnil,
+ Qt, Fidentity);
+ if (!STRINGP (filename))
+ return Qnil;
/* If the file name has special constructs in it,
call the corresponding file handler. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117670: * dired.c (Ffile_attributes): Return Qnil, if Fexpand_file_name,
Michael Albinus <=