[Emacs-diffs] trunk r113409: * ido.el (ido-read-file-name): Guard against non-symbol value.

[Leo Liu]

------------------------------------------------------------
revno: 113409
revision-id: address@hidden
parent: address@hidden
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Sat 2013-07-13 12:44:19 +0800
message:
  * ido.el (ido-read-file-name): Guard against non-symbol value.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/ido.el                    ido.el-20091113204419-o5vbwnq5f7feedwu-2430

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-13 01:55:58 +0000
+++ b/lisp/ChangeLog    2013-07-13 04:44:19 +0000
@@ -1,3 +1,7 @@
+2013-07-13  Leo Liu  <address@hidden>
+
+       * ido.el (ido-read-file-name): Guard against non-symbol value.
+
 2013-07-13  Fabián Ezequiel Gallina  <address@hidden>
 
        * progmodes/python.el (python-imenu--build-tree): Fix corner case

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2013-07-13 00:57:47 +0000
+++ b/lisp/ido.el       2013-07-13 04:44:19 +0000
@@ -4760,16 +4760,20 @@
   (let (filename)
     (cond
      ((or (eq predicate 'file-directory-p)
-         (eq (get this-command 'ido) 'dir)
+         (eq (and (symbolp this-command)
+                  (get this-command 'ido)) 'dir)
          (memq this-command ido-read-file-name-as-directory-commands))
       (setq filename
            (ido-read-directory-name prompt dir default-filename mustmatch 
initial)))
-     ((and (not (eq (get this-command 'ido) 'ignore))
+     ((and (not (eq (and (symbolp this-command)
+                        (get this-command 'ido)) 'ignore))
           (not (memq this-command ido-read-file-name-non-ido))
           (or (null predicate) (eq predicate 'file-exists-p)))
       (let* (ido-saved-vc-hb
             (ido-context-switch-command
-             (if (eq (get this-command 'ido) 'find-file) nil 'ignore))
+             (if (eq (and (symbolp this-command)
+                          (get this-command 'ido)) 'find-file)
+                 nil 'ignore))
             (vc-handled-backends (and (boundp 'vc-handled-backends) 
vc-handled-backends))
             (minibuffer-completing-file-name t)
             (ido-current-directory (ido-expand-directory dir))