------------------------------------------------------------ revno: 117076 committer: Glenn Morris branch nick: trunk timestamp: Fri 2014-05-09 00:02:00 -0700 message: Use file-accessible-directory-p in some more places * lisp/files.el (file-expand-wildcards): * lisp/man.el (Man-support-local-filenames): * lisp/printing.el (pr-i-directory, pr-interface-directory): * lisp/progmodes/grep.el (lgrep, rgrep): * lisp/textmodes/ispell.el (ispell-call-process) (ispell-call-process-region, ispell-start-process) (ispell-init-process): * lisp/mh-e/mh-e.el (mh-variants): Use file-accessible-directory-p. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-05-08 03:41:21 +0000 +++ lisp/ChangeLog 2014-05-09 07:02:00 +0000 @@ -1,3 +1,13 @@ +2014-05-09 Glenn Morris + + * files.el (file-expand-wildcards): + * man.el (Man-support-local-filenames): + * printing.el (pr-i-directory, pr-interface-directory): + * progmodes/grep.el (lgrep, rgrep): + * textmodes/ispell.el (ispell-call-process) + (ispell-call-process-region, ispell-start-process) + (ispell-init-process): Use file-accessible-directory-p. + 2014-05-08 Stefan Monnier * xt-mouse.el: Drop spurious/oddly shaped events (bug#17378). === modified file 'lisp/files.el' --- lisp/files.el 2014-04-07 20:54:16 +0000 +++ lisp/files.el 2014-05-09 07:02:00 +0000 @@ -5987,10 +5987,9 @@ (file-expand-wildcards (directory-file-name dirpart))) (list dirpart))) contents) - (while dirs - (when (or (null (car dirs)) ; Possible if DIRPART is not wild. - (and (file-directory-p (directory-file-name (car dirs))) - (file-readable-p (car dirs)))) + (dolist (dir dirs) + (when (or (null dir) ; Possible if DIRPART is not wild. + (file-accessible-directory-p dir)) (let ((this-dir-contents ;; Filter out "." and ".." (delq nil @@ -5998,16 +5997,15 @@ (unless (string-match "\\`\\.\\.?\\'" (file-name-nondirectory name)) name)) - (directory-files (or (car dirs) ".") full + (directory-files (or dir ".") full (wildcard-to-regexp nondir)))))) (setq contents (nconc - (if (and (car dirs) (not full)) - (mapcar (function (lambda (name) (concat (car dirs) name))) + (if (and dir (not full)) + (mapcar #'(lambda (name) (concat dir name)) this-dir-contents) this-dir-contents) - contents)))) - (setq dirs (cdr dirs))) + contents))))) contents))) ;; Let Tramp know that `file-expand-wildcards' does not need an advice. === modified file 'lisp/man.el' --- lisp/man.el 2014-02-10 01:34:22 +0000 +++ lisp/man.el 2014-05-09 07:02:00 +0000 @@ -1,7 +1,6 @@ ;;; man.el --- browse UNIX manual pages -*- coding: utf-8 -*- -;; Copyright (C) 1993-1994, 1996-1997, 2001-2014 Free Software -;; Foundation, Inc. +;; Copyright (C) 1993-1994, 1996-1997, 2001-2014 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw ;; Maintainer: emacs-devel@gnu.org @@ -695,9 +694,8 @@ (with-temp-buffer (let ((default-directory ;; Ensure that `default-directory' exists and is readable. - (if (and (file-directory-p default-directory) - (file-readable-p default-directory)) - default-directory + (if (file-accessible-directory-p default-directory) + default-directory (expand-file-name "~/")))) (ignore-errors (call-process manual-program nil t nil "--help"))) === modified file 'lisp/mh-e/ChangeLog' --- lisp/mh-e/ChangeLog 2014-03-17 00:50:05 +0000 +++ lisp/mh-e/ChangeLog 2014-05-09 07:02:00 +0000 @@ -1,3 +1,7 @@ +2014-05-09 Glenn Morris + + * mh-e.el (mh-variants): Use file-accessible-directory-p. + 2014-03-16 Bill Wohler * mh-folder.el (mh-regenerate-headers): Fix scan: bad message list === modified file 'lisp/mh-e/mh-e.el' --- lisp/mh-e/mh-e.el 2014-02-24 02:04:35 +0000 +++ lisp/mh-e/mh-e.el 2014-05-09 07:02:00 +0000 @@ -1,7 +1,7 @@ ;;; mh-e.el --- GNU Emacs interface to the MH mail system -;; Copyright (C) 1985-1988, 1990, 1992-1995, 1997, 1999-2014 Free -;; Software Foundation, Inc. +;; Copyright (C) 1985-1988, 1990, 1992-1995, 1997, 1999-2014 +;; Free Software Foundation, Inc. ;; Author: Bill Wohler ;; Maintainer: Bill Wohler @@ -739,7 +739,7 @@ (setq dir (file-chase-links (directory-file-name dir))) (add-to-list 'list-unique dir)) (loop for dir in (nreverse list-unique) do - (when (and dir (file-directory-p dir) (file-readable-p dir)) + (when (and dir (file-accessible-directory-p dir)) (let ((variant (mh-variant-info dir))) (if variant (add-to-list 'mh-variants variant))))) === modified file 'lisp/printing.el' --- lisp/printing.el 2014-01-01 07:43:34 +0000 +++ lisp/printing.el 2014-05-09 07:02:00 +0000 @@ -6543,8 +6543,7 @@ (defun pr-i-directory () - (or (and (file-directory-p pr-i-directory) - (file-readable-p pr-i-directory)) + (or (file-accessible-directory-p pr-i-directory) (error "Please specify be a readable directory"))) @@ -6552,8 +6551,7 @@ (and pr-buffer-verbose (message "You can use M-TAB or ESC TAB for file completion")) (let ((dir (widget-value widget))) - (and (file-directory-p dir) - (file-readable-p dir) + (and (file-accessible-directory-p dir) (setq pr-i-directory dir)))) === modified file 'lisp/progmodes/grep.el' --- lisp/progmodes/grep.el 2014-04-12 19:38:06 +0000 +++ lisp/progmodes/grep.el 2014-05-09 07:02:00 +0000 @@ -1,7 +1,6 @@ ;;; grep.el --- run `grep' and display the results -*- lexical-binding:t -*- -;; Copyright (C) 1985-1987, 1993-1999, 2001-2014 Free Software -;; Foundation, Inc. +;; Copyright (C) 1985-1987, 1993-1999, 2001-2014 Free Software Foundation, Inc. ;; Author: Roland McGrath ;; Maintainer: emacs-devel@gnu.org @@ -905,7 +904,7 @@ (confirm (equal current-prefix-arg '(4)))) (list regexp files dir confirm)))))) (when (and (stringp regexp) (> (length regexp) 0)) - (unless (and dir (file-directory-p dir) (file-readable-p dir)) + (unless (and dir (file-acessible-directory-p dir)) (setq dir default-directory)) (let ((command regexp)) (if (null files) @@ -986,7 +985,7 @@ (confirm (equal current-prefix-arg '(4)))) (list regexp files dir confirm)))))) (when (and (stringp regexp) (> (length regexp) 0)) - (unless (and dir (file-directory-p dir) (file-readable-p dir)) + (unless (and dir (file-accessible-directory-p dir)) (setq dir default-directory)) (if (null files) (if (not (string= regexp (if (consp grep-find-command) === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2014-01-31 09:41:54 +0000 +++ lisp/textmodes/ispell.el 2014-05-09 07:02:00 +0000 @@ -931,16 +931,14 @@ (defun ispell-call-process (&rest args) "Like `call-process' but defend against bad `default-directory'." (let ((default-directory default-directory)) - (unless (and (file-directory-p default-directory) - (file-readable-p default-directory)) + (unless (file-accessible-directory-p default-directory) (setq default-directory (expand-file-name "~/"))) (apply 'call-process args))) (defun ispell-call-process-region (&rest args) "Like `call-process-region' but defend against bad `default-directory'." (let ((default-directory default-directory)) - (unless (and (file-directory-p default-directory) - (file-readable-p default-directory)) + (unless (file-accessible-directory-p default-directory) (setq default-directory (expand-file-name "~/"))) (apply 'call-process-region args))) @@ -2939,8 +2937,7 @@ (ispell-hunspell-fill-dictionary-entry ispell-current-dictionary))) (let* ((default-directory - (if (and (file-directory-p default-directory) - (file-readable-p default-directory)) + (if (file-accessible-directory-p default-directory) default-directory ;; Defend against bad `default-directory'. (expand-file-name "~/"))) @@ -2998,8 +2995,7 @@ (if (or ispell-really-aspell ispell-really-hunspell ;; Protect against bad default-directory - (not (and (file-directory-p default-directory) - (file-readable-p default-directory))) + (not (file-accessible-directory-p default-directory)) ;; Ispell and per-dir personal dicts available (not (or (file-readable-p (concat default-directory ".ispell_words")) ------------------------------------------------------------ revno: 117075 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-05-08 23:43:52 -0700 message: * gnus/mml2015.el (mml2015-display-key-image): Fix :version tag in previous. diff: === modified file 'lisp/gnus/mml2015.el' --- lisp/gnus/mml2015.el 2014-05-08 22:42:13 +0000 +++ lisp/gnus/mml2015.el 2014-05-09 06:43:52 +0000 @@ -149,7 +149,7 @@ (defcustom mml2015-display-key-image t "If t, try to display key images." - :version "24.4" + :version "24.5" :group 'mime-security :type 'boolean) ------------------------------------------------------------ revno: 117074 author: Adam Sjøgren committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2014-05-08 22:42:13 +0000 message: lisp/gnus/mml2015.el (mml2015-display-key-image): New variable diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-05-08 03:41:21 +0000 +++ lisp/gnus/ChangeLog 2014-05-08 22:42:13 +0000 @@ -1,3 +1,7 @@ +2014-05-08 Adam Sjøgren + + * mml2015.el (mml2015-display-key-image): New variable. + 2014-05-08 Glenn Morris * gnus-fun.el (gnus-grab-cam-face): === modified file 'lisp/gnus/mml2015.el' --- lisp/gnus/mml2015.el 2014-03-23 23:13:36 +0000 +++ lisp/gnus/mml2015.el 2014-05-08 22:42:13 +0000 @@ -147,6 +147,12 @@ :group 'mime-security :type 'integer) +(defcustom mml2015-display-key-image t + "If t, try to display key images." + :version "24.4" + :group 'mime-security + :type 'boolean) + ;; Extract plaintext from cleartext signature. IMO, this kind of task ;; should be done by GnuPG rather than Elisp, but older PGP backends ;; (such as Mailcrypt, and PGG) discard the output from GnuPG. @@ -898,7 +904,8 @@ (defun mml2015-epg-signature-to-string (signature) (concat (epg-signature-to-string signature) - (mml2015-epg-key-image-to-string (epg-signature-key-id signature)))) + (when mml2015-display-key-image + (mml2015-epg-key-image-to-string (epg-signature-key-id signature))))) (defun mml2015-epg-verify-result-to-string (verify-result) (mapconcat #'mml2015-epg-signature-to-string verify-result "\n")) ------------------------------------------------------------ revno: 117073 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2014-05-08 18:38:02 +0300 message: nt/INSTALL: More details about creating the build environment. diff: === modified file 'nt/INSTALL' --- nt/INSTALL 2014-05-05 10:06:04 +0000 +++ nt/INSTALL 2014-05-08 15:38:02 +0000 @@ -238,6 +238,16 @@ install the packages manually, we recommend to use the Windows port of the 'bsdtar' program, already mentioned above. + MSYS packages should be installed in a separate tree from MinGW. + For example, use D:\MSYS or D:\usr\MSYS as the top-level directory + from which you unpack all of the MSYS packages. + + After installing Automake and Autoconf, make sure any of the *.m4 + files you might have in your MinGW installation (e.g., pkg.m4 that + comes with pkg-config) also exist in the MSYS installation tree, in + the share/aclocal directory. Those *.m4 files which exist in the + MinGW tree, but not in the MSYS tree should be copied there. + If/when you are confident in your MinGW/MSYS installation, and want to speed up the builds, we recommend installing a pre-release version of Make from here: @@ -265,10 +275,6 @@ states the missing or incompatible DLL; be sure to find and install these missing DLLs. - MSYS packages should be installed in a separate tree from MinGW. - For example, use D:\MSYS or D:\usr\MSYS as the top-level directory - from which you unpack all of the MSYS packages. - Do NOT add the MSYS bin directory to your Windows Path! Only the MinGW bin directory should be on Path. When you install MSYS, it creates a shortcut on your desktop that invokes the MSYS Bash shell @@ -305,6 +311,10 @@ ok Checking for automake (need at least version 1.11)... ok + Checking for pkg-config (need at least version 0.9.0)... + ok + Checking for pkg.m4... + ok Your system has the required tools, running autoreconf... You can now run `./configure'. ------------------------------------------------------------ revno: 117072 [merge] committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-05-08 00:02:08 -0700 message: Merge from emacs-24; up to r117083 diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2014-05-08 03:41:21 +0000 +++ test/ChangeLog 2014-05-08 07:02:08 +0000 @@ -1,7 +1,8 @@ 2014-05-08 Glenn Morris * automated/vc-bzr.el (vc-bzr-test-bug9726, vc-bzr-test-bug9781) - (vc-bzr-test-faulty-bzr-autoloads): Disable bzr logging. + (vc-bzr-test-faulty-bzr-autoloads): + Give bzr a temporary home-directory, in case the real one is missing. 2014-05-08 Dmitry Gutov === modified file 'test/automated/vc-bzr.el' --- test/automated/vc-bzr.el 2014-05-08 03:34:20 +0000 +++ test/automated/vc-bzr.el 2014-05-08 06:58:46 +0000 @@ -31,17 +31,26 @@ (ert-deftest vc-bzr-test-bug9726 () "Test for http://debbugs.gnu.org/9726 ." (skip-unless (executable-find vc-bzr-program)) - (let* ((tempdir (make-temp-file "vc-bzr-test" t)) - (ignored-dir (expand-file-name "ignored-dir" tempdir)) - (default-directory (file-name-as-directory tempdir)) - (process-environment (cons (format "BZR_LOG=%s" null-device) + ;; Bzr wants to access HOME, e.g. to write ~/.bzr.log. + ;; This is a problem on hydra, where HOME is non-existent. + ;; You can disable logging with BZR_LOG=/dev/null, but then + ;; some commands (eg `bzr status') want to access ~/.bazaar, + ;; and will abort if they cannot. I could not figure out how to + ;; stop bzr doing that, so just set HOME to a tempir for the duration. + (let* ((homedir (make-temp-file "vc-bzr-test" t)) + (bzrdir (expand-file-name "bzr" homedir)) + (ignored-dir (progn + (make-directory bzrdir) + (expand-file-name "ignored-dir" bzrdir))) + (default-directory (file-name-as-directory bzrdir)) + (process-environment (cons (format "HOME=%s" homedir) process-environment))) (unwind-protect (progn (make-directory ignored-dir) (with-temp-buffer (insert (file-name-nondirectory ignored-dir)) - (write-region nil nil (expand-file-name ".bzrignore" tempdir) + (write-region nil nil (expand-file-name ".bzrignore" bzrdir) nil 'silent)) (call-process vc-bzr-program nil nil nil "init") (call-process vc-bzr-program nil nil nil "add") @@ -57,17 +66,20 @@ (with-current-buffer "*vc-dir*" (goto-char (point-min)) (should (search-forward "unregistered" nil t)))) - (delete-directory tempdir t)))) + (delete-directory homedir t)))) ;; Not specific to bzr. (ert-deftest vc-bzr-test-bug9781 () "Test for http://debbugs.gnu.org/9781 ." (skip-unless (executable-find vc-bzr-program)) - (let* ((tempdir (make-temp-file "vc-bzr-test" t)) - (subdir (expand-file-name "subdir" tempdir)) - (file (expand-file-name "file" tempdir)) - (default-directory (file-name-as-directory tempdir)) - (process-environment (cons (format "BZR_LOG=%s" null-device) + (let* ((homedir (make-temp-file "vc-bzr-test" t)) + (bzrdir (expand-file-name "bzr" homedir)) + (subdir (progn + (make-directory bzrdir) + (expand-file-name "subdir" bzrdir))) + (file (expand-file-name "file" bzrdir)) + (default-directory (file-name-as-directory bzrdir)) + (process-environment (cons (format "HOME=%s" homedir) process-environment))) (unwind-protect (progn @@ -84,7 +96,7 @@ (with-temp-buffer (insert "different text") (write-region nil nil file nil 'silent)) - (vc-dir tempdir) + (vc-dir bzrdir) (while (vc-dir-busy) (sit-for 0.1)) (vc-dir-mark-all-files t) @@ -95,17 +107,20 @@ (vc-next-action nil)) (fset 'y-or-n-p f))) (should (get-buffer "*vc-log*"))) - (delete-directory tempdir t)))) + (delete-directory homedir t)))) ;; http://lists.gnu.org/archive/html/help-gnu-emacs/2012-04/msg00145.html (ert-deftest vc-bzr-test-faulty-bzr-autoloads () "Test we can generate autoloads in a bzr directory when bzr is faulty." (skip-unless (executable-find vc-bzr-program)) - (let* ((tempdir (make-temp-file "vc-bzr-test" t)) - (file (expand-file-name "foo.el" tempdir)) - (default-directory (file-name-as-directory tempdir)) - (generated-autoload-file (expand-file-name "loaddefs.el" tempdir)) - (process-environment (cons (format "BZR_LOG=%s" null-device) + (let* ((homedir (make-temp-file "vc-bzr-test" t)) + (bzrdir (expand-file-name "bzr" homedir)) + (file (progn + (make-directory bzrdir) + (expand-file-name "foo.el" bzrdir))) + (default-directory (file-name-as-directory bzrdir)) + (generated-autoload-file (expand-file-name "loaddefs.el" bzrdir)) + (process-environment (cons (format "HOME=%s" homedir) process-environment))) (unwind-protect (progn @@ -123,6 +138,6 @@ (delete-file ".bzr/checkout/dirstate") (should (progn (update-directory-autoloads default-directory) t))) - (delete-directory tempdir t)))) + (delete-directory homedir t)))) ;;; vc-bzr.el ends here ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.