Merge.

10 files changed, 265 insertions, 60 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index be7c45339fa..e40d43ee8b9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,32 @@
+2012-01-15  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-remote-path): Set tramp-autoload cookie.
+
+2012-01-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * info.el (Info-toc-build): If the Info file has no "Up" pointer,
+        don't pass the (nil) value of `upnode' to string-match.
+
+2012-01-14  Chong Yidong  <cyd@gnu.org>
+
+        * startup.el (command-line): Fix X resource class for cursorColor.
+        Fix values recognized by the cursorBlink resource.
+
+2012-01-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * epg.el (epg--make-temp-file): Avoid permission race condition
+        when running on old Emacs versions (bug#10403).
+
+2012-01-14  Glenn Morris  <rgm@gnu.org>
+
+        * dired.el (dired-get-filename): Fix 'verbatim case of previous change.
+
 2012-01-13  Glenn Morris  <rgm@gnu.org>
 
+        * dired.el (dired-switches-escape-p): New function.
+        (dired-insert-directory): Use dired-switches-escape-p.
+        (dired-get-filename): Undo "\ " quoting if needed.  (Bug#10469)
+
         * find-dired.el (find-ls-option): Doc fix.  (Bug#10262)
 
 2012-01-12  Glenn Morris  <rgm@gnu.org>
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 7d6f9f570ec..f9a546ec894 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,20 @@
+2012-01-09  Eric Ludlam  <zappo@gnu.org>
+
+        * ede.el (ede-project-directories): New option.
+        (ede-directory-safe-p): Check it.
+        (ede-initialize-state-current-buffer, ede, ede-new)
+        (ede-check-project-directory, ede-rescan-toplevel)
+        (ede-load-project-file, ede-parent-project, ede-current-project):
+        (ede-target-parent): Avoid loading in a project unless it is safe,
+        since it may involve malicious code.  This security flaw was
+        pointed out by Hiroshi Oota.
+
+        * ede/auto.el (ede-project-autoload): Add safe-p slot.
+        (ede-project-class-files): Projects using Project.ede are unsafe.
+        (ede-auto-load-project): New method.
+
+        * ede/simple.el (ede-project-class-files): Mark as unsafe.
+
 2011-12-19  Sam Steingold  <sds@gnu.org>
 
         * semantic/edit.el (semantic-edits-incremental-parser): Add the
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 5f336df5514..cc8b6f53242 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -94,6 +94,42 @@ target willing to take the file.  'never means never perform the check."
   :group 'ede
   :type 'sexp) ; make this be a list of options some day
 
+(defcustom ede-project-directories nil
+  "Directories in which EDE may search for project files.
+If the value is t, EDE may search in any directory.
+
+If the value is a function, EDE calls that function with one
+argument, the directory name; the function should return t iff
+EDE should look for project files in the directory.
+
+Otherwise, the value should be a list of fully-expanded directory
+names.  EDE searches for project files only in those directories.
+If you invoke the commands \\[ede] or \\[ede-new] on a directory
+that is not listed, Emacs will offer to add it to the list.
+
+Any other value disables searching for EDE project files."
+  :group 'ede
+  :type '(choice (const :tag "Any directory" t)
+                 (repeat :tag "List of directories"
+                         (directory))
+                 (function :tag "Predicate"))
+  :version "23.4"
+  :risky t)
+
+(defun ede-directory-safe-p (dir)
+  "Return non-nil if DIR is a safe directory to load projects from.
+Projects that do not load a project definition as Emacs Lisp code
+are safe, and can be loaded automatically.  Other project types,
+such as those created with Project.ede files, are safe only if
+specified by `ede-project-directories'."
+  (setq dir (directory-file-name (expand-file-name dir)))
+  ;; Load only if allowed by `ede-project-directories'.
+  (or (eq ede-project-directories t)
+      (and (functionp ede-project-directories)
+           (funcall ede-project-directories dir))
+      (and (listp ede-project-directories)
+           (member dir ede-project-directories))))
+
 
 ;;; Management variables
 
@@ -420,24 +456,42 @@ provided `global-ede-mode' is enabled."
 Sets buffer local variables for EDE."
   (let* ((ROOT nil)
          (proj (ede-directory-get-open-project default-directory
-                                               'ROOT)))
+                                               'ROOT))
+         (projauto nil))
+
     (when (or proj ROOT
-              (ede-directory-project-p default-directory t))
+              ;; If there is no open project, look up the project
+              ;; autoloader to see if we should initialize.
+              (setq projauto (ede-directory-project-p default-directory t)))
+
+      (when (and (not proj) projauto)
+
+        ;; No project was loaded, but we have a project description
+        ;; object.  This means that we can check if it is a safe
+        ;; project to load before requesting it to be loaded.
 
-      (when (not proj)
-        ;; @todo - this could be wasteful.
-        (setq proj (ede-load-project-file default-directory 'ROOT)))
+        (when (or (oref projauto safe-p)
+                  ;; The project style is not safe, so check if it is
+                  ;; in `ede-project-directories'.
+                  (let ((top (ede-toplevel-project default-directory)))
+                    (ede-directory-safe-p top)))
 
-      (setq ede-object (ede-buffer-object (current-buffer)
+          ;; The project is safe, so load it in.
+          (setq proj (ede-load-project-file default-directory 'ROOT))))
+
+      ;; Only initialize EDE state in this buffer if we found a project.
+      (when proj
+
+        (setq ede-object (ede-buffer-object (current-buffer)
                                           'ede-object-project))
 
-      (setq ede-object-root-project
-            (or ROOT (ede-project-root ede-object-project)))
+        (setq ede-object-root-project
+              (or ROOT (ede-project-root ede-object-project)))
 
-      (if (and (not ede-object) ede-object-project)
-          (ede-auto-add-to-target))
+        (if (and (not ede-object) ede-object-project)
+            (ede-auto-add-to-target))
 
-      (ede-apply-target-options))))
+        (ede-apply-target-options)))))
 
 (defun ede-reset-all-buffers (onoff)
   "Reset all the buffers due to change in EDE.
@@ -557,13 +611,73 @@ of objects with the `ede-want-file-p' method."
 
 ;;; Interactive method invocations
 ;;
-(defun ede (file)
-  "Start up EDE on something.
-Argument FILE is the file or directory to load a project from."
-  (interactive "fProject File: ")
-  (if (not (file-exists-p file))
-      (ede-new file)
-    (ede-load-project-file (file-name-directory file))))
+(defun ede (dir)
+  "Start up EDE for directory DIR.
+If DIR has an existing project file, load it.
+Otherwise, create a new project for DIR."
+  (interactive
+   ;; When choosing a directory to turn on, and we see some directory here,
+   ;; provide that as the default.
+   (let* ((top (ede-toplevel-project default-directory))
+          (promptdflt (or top default-directory)))
+     (list (read-directory-name "Project directory: "
+                                promptdflt promptdflt t))))
+  (unless (file-directory-p dir)
+    (error "%s is not a directory" dir))
+  (when (ede-directory-get-open-project dir)
+    (error "%s already has an open project associated with it" dir))
+
+  ;; Check if the directory has been added to the list of safe
+  ;; directories.  It can also add the directory to the safe list if
+  ;; the user chooses.
+  (if (ede-check-project-directory dir)
+      (progn
+        ;; If there is a project in DIR, load it, otherwise do
+        ;; nothing.
+        (ede-load-project-file dir)
+
+        ;; Check if we loaded anything on the previous line.
+        (if (ede-current-project dir)
+
+            ;; We successfully opened an existing project.  Some open
+            ;; buffers may also be referring to this project.
+            ;; Resetting all the buffers will get them to also point
+            ;; at this new open project.
+            (ede-reset-all-buffers 1)
+
+          ;; ELSE
+          ;; There was no project, so switch to `ede-new' which is how
+          ;; a user can select a new kind of project to create.
+          (let ((default-directory (expand-file-name dir)))
+            (call-interactively 'ede-new))))
+
+    ;; If the proposed directory isn't safe, then say so.
+    (error "%s is not an allowed project directory in `ede-project-directories'"
+           dir)))
+
+(defun ede-check-project-directory (dir)
+  "Check if DIR should be in `ede-project-directories'.
+If it is not, try asking the user if it should be added; if so,
+add it and save `ede-project-directories' via Customize.
+Return nil iff DIR should not be in `ede-project-directories'."
+  (setq dir (directory-file-name (expand-file-name dir))) ; strip trailing /
+  (or (eq ede-project-directories t)
+      (and (functionp ede-project-directories)
+           (funcall ede-project-directories dir))
+      ;; If `ede-project-directories' is a list, maybe add it.
+      (when (listp ede-project-directories)
+        (or (member dir ede-project-directories)
+            (when (y-or-n-p (format "`%s' is not listed in `ede-project-directories'.
+Add it to the list of allowed project directories? "
+                                    dir))
+              (push dir ede-project-directories)
+              ;; If possible, save `ede-project-directories'.
+              (if (or custom-file user-init-file)
+                  (let ((coding-system-for-read nil))
+                    (customize-save-variable
+                     'ede-project-directories
+                     ede-project-directories)))
+              t)))))
 
 (defun ede-new (type &optional name)
   "Create a new project starting from project type TYPE.
@@ -598,6 +712,11 @@ Optional argument NAME is the name to give this project."
     (error "Cannot create project in non-existent directory %s" default-directory))
   (when (not (file-writable-p default-directory))
     (error "No write permissions for %s" default-directory))
+  (unless (ede-check-project-directory default-directory)
+    (error "%s is not an allowed project directory in `ede-project-directories'"
+           default-directory))
+  ;; Make sure the project directory is loadable in the future.
+  (ede-check-project-directory default-directory)
   ;; Create the project
   (let* ((obj (object-assoc type 'name ede-project-class-files))
          (nobj (let ((f (oref obj file))
@@ -631,6 +750,10 @@ Optional argument NAME is the name to give this project."
         (ede-add-subproject pp nobj)
         (ede-commit-project pp)))
     (ede-commit-project nobj))
+  ;; Once the project is created, load it again.  This used to happen
+  ;; lazily, but with project loading occurring less often and with
+  ;; security in mind, this is now the safe time to reload.
+  (ede-load-project-file default-directory)
   ;; Have the menu appear
   (setq ede-minor-mode t)
   ;; Allert the user
@@ -653,11 +776,16 @@ ARGS are additional arguments to pass to method SYM."
 (defun ede-rescan-toplevel ()
   "Rescan all project files."
   (interactive)
-  (let ((toppath (ede-toplevel-project default-directory))
-        (ede-deep-rescan t))
-    (project-rescan (ede-load-project-file toppath))
-    (ede-reset-all-buffers 1)
-    ))
+  (if (not (ede-directory-get-open-project default-directory))
+      ;; This directory isn't open.  Can't rescan.
+      (error "Attempt to rescan a project that isn't open")
+
+    ;; Continue
+    (let ((toppath (ede-toplevel-project default-directory))
+          (ede-deep-rescan t))
+
+      (project-rescan (ede-load-project-file toppath))
+      (ede-reset-all-buffers 1))))
 
 (defun ede-new-target (&rest args)
   "Create a new target specific to this type of project file.
@@ -893,7 +1021,7 @@ Optional ROOTRETURN will return the root project for DIR."
   ;; Do the load
   ;;(message "EDE LOAD : %S" file)
   (let* ((file dir)
-         (path (expand-file-name (file-name-directory file)))
+         (path (file-name-as-directory (expand-file-name dir)))
          (pfc (ede-directory-project-p path))
          (toppath nil)
          (o nil))
@@ -922,13 +1050,11 @@ Optional ROOTRETURN will return the root project for DIR."
       ;; See if it's been loaded before
       (setq o (object-assoc (ede-dir-to-projectfile pfc toppath) 'file
                             ede-projects))
-      (if (not o)
-          ;; If not, get it now.
-          (let ((ede-constructing pfc))
-            (setq o (funcall (oref pfc load-type) toppath))
-            (when (not o)
-              (error "Project type error: :load-type failed to create a project"))
-            (ede-add-project-to-global-list o)))
+
+      ;; If not open yet, load it.
+      (unless o
+        (let ((ede-constructing pfc))
+          (setq o (ede-auto-load-project pfc toppath))))
 
       ;; Return the found root project.
       (when rootreturn (set rootreturn o))
@@ -982,13 +1108,7 @@ Optional argument OBJ is an object to find the parent of."
              (and root
                   (ede-find-subproject-for-directory root updir))
              ;; Try the all structure based search.
-             (ede-directory-get-open-project updir)
-             ;; Load up the project file as a last resort.
-             ;; Last resort since it uses file-truename, and other
-             ;; slow features.
-             (and (ede-directory-project-p updir)
-                  (ede-load-project-file
-                   (file-name-as-directory updir))))))))))
+             (ede-directory-get-open-project updir))))))))
 
 (defun ede-current-project (&optional dir)
   "Return the current project file.
@@ -1002,11 +1122,7 @@ If optional DIR is provided, get the project for DIR instead."
     ;; No current project.
     (when (not ans)
       (let* ((ldir (or dir default-directory)))
-        (setq ans (ede-directory-get-open-project ldir))
-        (or ans
-            ;; No open project, if this dir pass project-p, then load.
-            (when (ede-directory-project-p ldir)
-              (setq ans (ede-load-project-file ldir))))))
+        (setq ans (ede-directory-get-open-project ldir))))
     ;; Return what we found.
     ans))
 
@@ -1061,12 +1177,13 @@ If TARGET belongs to a subproject, return that project file."
   "Return the project which is the parent of TARGET.
 It is recommended you track the project a different way as this function
 could become slow in time."
-  ;; @todo - use ede-object-project as a starting point.
-  (let ((ans nil) (projs ede-projects))
-    (while (and (not ans) projs)
-      (setq ans (ede-target-in-project-p (car projs) target)
-            projs (cdr projs)))
-    ans))
+  (or ede-object-project
+      ;; If not cached, derive it from the current directory of the target.
+      (let ((ans nil) (projs ede-projects))
+        (while (and (not ans) projs)
+          (setq ans (ede-target-in-project-p (car projs) target)
+                projs (cdr projs)))
+        ans)))
 
 (defmethod ede-find-target ((proj ede-project) buffer)
   "Fetch the target in PROJ belonging to BUFFER or nil."
diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el
index 7ff291d3675..b458cc246f0 100644
--- a/lisp/cedet/ede/auto.el
+++ b/lisp/cedet/ede/auto.el
@@ -58,6 +58,13 @@ associated with a single object class, based on the initializers used.")
           :initform t
           :documentation
           "Non-nil if this is an option when a user creates a project.")
+   (safe-p :initarg :safe-p
+           :initform t
+           :documentation
+           "Non-nil if the project load files are \"safe\".
+An unsafe project is one that loads project variables via Emacs
+Lisp code.  A safe project is one that loads project variables by
+scanning files without loading Lisp code from them.")
    )
   "Class representing minimal knowledge set to run preliminary EDE functions.
 When more advanced functionality is needed from a project type, that projects
@@ -69,13 +76,15 @@ type is required and the load function used.")
                          :name "Make" :file 'ede/proj
                          :proj-file "Project.ede"
                          :load-type 'ede-proj-load
-                         :class-sym 'ede-proj-project)
+                         :class-sym 'ede-proj-project
+                         :safe-p nil)
    (ede-project-autoload "edeproject-automake"
                          :name "Automake" :file 'ede/proj
                          :proj-file "Project.ede"
                          :initializers '(:makefile-type Makefile.am)
                          :load-type 'ede-proj-load
-                         :class-sym 'ede-proj-project)
+                         :class-sym 'ede-proj-project
+                         :safe-p nil)
    (ede-project-autoload "automake"
                          :name "automake" :file 'ede/project-am
                          :proj-file "Makefile.am"
@@ -84,6 +93,8 @@ type is required and the load function used.")
                          :new-p nil))
   "List of vectors defining how to determine what type of projects exist.")
 
+(put 'ede-project-class-files 'risky-local-variable t)
+
 ;;; EDE project-autoload methods
 ;;
 (defmethod ede-project-root ((this ede-project-autoload))
@@ -122,6 +133,19 @@ Return nil if the project file does not exist."
     (when (and f (file-exists-p f))
       f)))
 
+(defmethod ede-auto-load-project ((this ede-project-autoload) dir)
+  "Load in the project associated with THIS project autoload description.
+THIS project description should be valid for DIR, where the project will
+be loaded."
+  ;; Last line of defense: don't load unsafe projects.
+  (when (not (or (oref this :safe-p)
+                 (ede-directory-safe-p dir)))
+    (error "Attempt to load an unsafe project (bug elsewhere in EDE)"))
+  ;; Things are good - so load the project.
+  (let ((o (funcall (oref this load-type) dir)))
+    (when (not o)
+      (error "Project type error: :load-type failed to create a project"))
+    (ede-add-project-to-global-list o)))
 
 (provide 'ede/auto)
 
diff --git a/lisp/cedet/ede/simple.el b/lisp/cedet/ede/simple.el
index 028c126e9e4..5cfa750c63f 100644
--- a/lisp/cedet/ede/simple.el
+++ b/lisp/cedet/ede/simple.el
@@ -50,7 +50,8 @@
               :name "Simple" :file 'ede/simple
               :proj-file 'ede-simple-projectfile-for-dir
               :load-type 'ede-simple-load
-              :class-sym 'ede-simple-project)
+              :class-sym 'ede-simple-project
+              :safe-p nil)
              t)
 
 (defcustom ede-simple-save-directory "~/.ede"
diff --git a/lisp/dired.el b/lisp/dired.el
index 6f2ddbbc73d..f1a778ad05a 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1111,6 +1111,11 @@ BEG..END is the line where the file info is located."
 
 (defvar ls-lisp-use-insert-directory-program)
 
+(defun dired-switches-escape-p (switches)
+  "Return non-nil if the string SWITCHES contains -b or --escape."
+  ;; Do not match things like "--block-size" that happen to contain "b".
+  (string-match "\\(\\`\\| \\)-[[:alnum:]]*b\\|--escape\\>" switches))
+
 (defun dired-insert-directory (dir switches &optional file-list wildcard hdr)
   "Insert a directory listing of DIR, Dired style.
 Use SWITCHES to make the listings.
@@ -1152,7 +1157,7 @@ see `dired-use-ls-dired' for more details.")
             (dired-align-file beg (point))))
       (insert-directory dir switches wildcard (not wildcard)))
     ;; Quote certain characters, unless ls quoted them for us.
-    (if (not (string-match "b" dired-actual-switches))
+    (if (not (dired-switches-escape-p dired-actual-switches))
         (save-excursion
           (setq end (point-marker))
           (goto-char opoint)
@@ -2099,7 +2104,18 @@ Otherwise, an error occurs in these cases."
           ;; with quotation marks in their names.
           (while (string-match "\\(?:[^\\]\\|\\`\\)\\(\"\\)" file)
             (setq file (replace-match "\\\"" nil t file 1)))
-
+          ;; Unescape any spaces escaped by ls -b (bug#10469).
+          ;; Other -b quotes, eg \t, \n, work transparently.
+          (if (dired-switches-escape-p dired-actual-switches)
+              (let ((start 0)
+                    (rep "")
+                    (shift -1))
+                (if (eq localp 'verbatim)
+                    (setq rep "\\\\"
+                          shift +1))
+                (while (string-match "\\(\\\\\\) " file start)
+                  (setq file (replace-match rep nil t file 1)
+                        start (+ shift (match-end 0))))))
           (when (eq system-type 'windows-nt)
             (save-match-data
               (let ((start 0))
@@ -2107,6 +2123,7 @@ Otherwise, an error occurs in these cases."
                   (aset file (match-beginning 0) ?/)
                   (setq start (match-end 0))))))
 
+          ;; Hence we don't need to worry about converting `\\' back to `\'.
           (setq file (read (concat "\"" file "\"")))
           ;; The above `read' will return a unibyte string if FILE
           ;; contains eight-bit-control/graphic characters.
diff --git a/lisp/epg.el b/lisp/epg.el
index 3505e183c1f..6529afb2d3c 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1951,7 +1951,8 @@ The returned file name (created by appending some random characters at the end
 of PREFIX, and expanding against `temporary-file-directory' if necessary),
 is guaranteed to point to a newly created empty file.
 You can then use `write-region' to write new data into the file."
-      (let (tempdir tempfile)
+      (let ((orig-modes (default-file-modes))
+            tempdir tempfile)
         (setq prefix (expand-file-name prefix
                                        (if (featurep 'xemacs)
                                            (temp-directory)
@@ -1959,6 +1960,7 @@ You can then use `write-region' to write new data into the file."
         (unwind-protect
             (let (file)
               ;; First, create a temporary directory.
+              (set-default-file-modes #o700)
               (while (condition-case ()
                          (progn
                            (setq tempdir (make-temp-name
@@ -1969,14 +1971,12 @@ You can then use `write-region' to write new data into the file."
                            (make-directory tempdir))
                        ;; let's try again.
                        (file-already-exists t)))
-              (set-file-modes tempdir 448)
               ;; Second, create a temporary file in the tempdir.
               ;; There *is* a race condition between `make-temp-name'
               ;; and `write-region', but we don't care it since we are
               ;; in a private directory now.
               (setq tempfile (make-temp-name (concat tempdir "/EMU")))
               (write-region "" nil tempfile nil 'silent)
-              (set-file-modes tempfile 384)
               ;; Finally, make a hard-link from the tempfile.
               (while (condition-case ()
                          (progn
@@ -1986,6 +1986,7 @@ You can then use `write-region' to write new data into the file."
                        ;; let's try again.
                        (file-already-exists t)))
               file)
+          (set-default-file-modes orig-modes)
           ;; Cleanup the tempfile.
           (and tempfile
                (file-exists-p tempfile)
diff --git a/lisp/info.el b/lisp/info.el
index 94d29518995..a8cb141114c 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2251,7 +2251,7 @@ Table of contents is created from the tree structure of menus."
                               (match-string-no-properties 1)))
                  (section "Top")
                  menu-items)
-            (when (string-match "(" upnode) (setq upnode nil))
+            (when (and upnode (string-match "(" upnode)) (setq upnode nil))
             (when (and (not (Info-index-node nodename file))
                        (re-search-forward "^\\* Menu:" bound t))
               (forward-line 1)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 02f933be367..2478253841f 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -512,6 +512,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
 ;; GNU/Linux (Debian, Suse): /bin:/usr/bin
 ;; FreeBSD: /usr/bin:/bin:/usr/sbin:/sbin: - beware trailing ":"!
 ;; IRIX64: /usr/bin
+;;;###tramp-autoload
 (defcustom tramp-remote-path
   '(tramp-default-remote-path "/bin" "/usr/bin" "/usr/sbin" "/usr/local/bin"
     "/local/bin" "/local/freeware/bin" "/local/gnu/bin"
diff --git a/lisp/startup.el b/lisp/startup.el
index 1cbf2f74c14..41056f3907e 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -910,7 +910,7 @@ opening the first frame (e.g. open a connection to an X server).")
             (setq no-blinking-cursor t)))
       ;; If the cursorColor X resource exists, alter the `cursor' face
       ;; spec, but mark it as changed outside of Customize.
-      (let ((color (x-get-resource "cursorColor" "CursorColor")))
+      (let ((color (x-get-resource "cursorColor" "Foreground")))
         (when color
           (put 'cursor 'theme-face
                `((changed ((t :background ,color)))))
@@ -929,7 +929,7 @@ opening the first frame (e.g. open a connection to an X server).")
               emacs-basic-display
               (and (memq window-system '(x w32 ns))
                    (not (member (x-get-resource "cursorBlink" "CursorBlink")
-                                '("off" "false")))))
+                                '("no" "off" "false" "0")))))
     (setq no-blinking-cursor t))
 
   ;; Re-evaluate predefined variables whose initial value depends on