commit 453af81f16a7eca0bc246c9278d19ba995641dfa (HEAD, refs/remotes/origin/master) Author: Mark Oteiza Date: Wed Oct 14 19:00:31 2015 -0400 * lisp/mpc.el (mpc-format): Always push form to pred diff --git a/lisp/mpc.el b/lisp/mpc.el index f83b478..55123ef 100644 --- a/lisp/mpc.el +++ b/lisp/mpc.el @@ -1010,30 +1010,30 @@ If PLAYLIST is t or nil or missing, use the main playlist." (substring time (match-end 0)) time))))) (`Cover - (if-let ((dir (file-name-directory - (mpc-file-local-copy (cdr (assq 'file info))))) - (covers '(".folder.png" "cover.jpg" "folder.jpg")) - (cover (cl-loop for file in (directory-files dir) - if (member (downcase file) covers) - return (concat dir file))) - (file (with-demoted-errors "MPC: %s" - (mpc-file-local-copy cover)))) - (let (image) - ;; (debug) - (push `(equal ',dir (file-name-directory (cdr (assq 'file info)))) pred) - (if (null size) (setq image (create-image file)) - (let ((tempfile (make-temp-file "mpc" nil ".jpg"))) - (call-process "convert" nil nil nil - "-scale" size file tempfile) - (setq image (create-image tempfile)) - (mpc-tempfiles-add image tempfile))) - (setq size nil) - (propertize dir 'display image)) - ;; Make sure we return something on which we can - ;; place the `mpc-pred' property, as - ;; a negative-cache. We could also use - ;; a default cover. - (progn (setq size nil) " "))) + (let ((dir (file-name-directory + (mpc-file-local-copy (cdr (assq 'file info)))))) + ;; (debug) + (push `(equal ',dir (file-name-directory (cdr (assq 'file info)))) pred) + (if-let ((covers '(".folder.png" "cover.jpg" "folder.jpg")) + (cover (cl-loop for file in (directory-files dir) + if (member (downcase file) covers) + return (concat dir file))) + (file (with-demoted-errors "MPC: %s" + (mpc-file-local-copy cover)))) + (let (image) + (if (null size) (setq image (create-image file)) + (let ((tempfile (make-temp-file "mpc" nil ".jpg"))) + (call-process "convert" nil nil nil + "-scale" size file tempfile) + (setq image (create-image tempfile)) + (mpc-tempfiles-add image tempfile))) + (setq size nil) + (propertize dir 'display image)) + ;; Make sure we return something on which we can + ;; place the `mpc-pred' property, as + ;; a negative-cache. We could also use + ;; a default cover. + (progn (setq size nil) " ")))) (_ (let ((val (cdr (assq tag info)))) ;; For Streaming URLs, there's no other info ;; than the URL in `file'. Pretend it's in `Title'. commit 943f7f902ed3d7a5ce00bbb5a9cc60e01607b661 Author: Paul Eggert Date: Wed Oct 14 14:46:22 2015 -0700 Spelling fixes * configure.ac (bitmapdir): Fix misspelling of bmd_acc. * test/automated/coding-tests.el (ert-test-coding-bogus-coding-systems): Fix misspelling of nonexistent file name. diff --git a/configure.ac b/configure.ac index 90c4e12..5b2d9c7 100644 --- a/configure.ac +++ b/configure.ac @@ -1747,7 +1747,7 @@ else bmd_acc="${bmd_acc}:${bmd}/bitmaps" fi done - bitmapdir=${bmdacc#:} + bitmapdir=${bmd_acc#:} fi test "${with_ns}" = maybe && test "${opsys}" != darwin && with_ns=no diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index a40f8f3..8a255d7 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 @@ -10383,13 +10383,13 @@ (todo-move-category): Keep the moved category's name unless the file moved to already has a category with that name. If the numerically last category of the source file was moved, make the - first category current to avoid selecting a nonexisting category. + first category current to avoid selecting a nonexistent category. (todo-merge-category): Fix implementation to make merging to a category in another file work as documented. Eliminate now insufficient and unnecessary renaming of archive category, correct document string accordingly, and clarify it. If the numerically last category of the source file was merged, make the first - category current to avoid selecting a nonexisting category. + category current to avoid selecting a nonexistent category. (todo-archive-done-item): When there are marked items and point happens to be on an unmarked item, ignore the latter. Don't leave point below last item after archiving marked items. diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 9116e50..58deaea 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -463,7 +463,7 @@ size, and full-buffer size." ;; Adjust the window width for when ;; the user disables the fringes, ;; which causes the display engine - ;; usurp one coplumn for the + ;; to usurp one column for the ;; continuation glyph. (if (and (null shr-width) (or (zerop (fringe-columns 'right)) diff --git a/src/xterm.c b/src/xterm.c index b059566..fcd81a1 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -2215,7 +2215,7 @@ x_query_colors (struct frame *f, XColor *colors, int ncolors) the 0xff00 we'd get by just zero-filling the lower bits. We generate a 32-bit scaled-up value and shift it, in case - the bit count doesn't divide 16 evently (e.g., when dealing + the bit count doesn't divide 16 evenly (e.g., when dealing with a 3-3-2 bit RGB display), to get more of the lower bits correct. diff --git a/test/automated/coding-tests.el b/test/automated/coding-tests.el index ebbf896..cda382f 100644 --- a/test/automated/coding-tests.el +++ b/test/automated/coding-tests.el @@ -36,7 +36,7 @@ (let (test-file) (or (file-directory-p coding-tests-workdir) (mkdir coding-tests-workdir t)) - (setq test-file (expand-file-name "nonexisting" coding-tests-workdir)) + (setq test-file (expand-file-name "nonexistent" coding-tests-workdir)) (if (file-exists-p test-file) (delete-file test-file)) (should-error diff --git a/test/automated/tabulated-list-test.el b/test/automated/tabulated-list-test.el index 5731db4..9aa62ee 100644 --- a/test/automated/tabulated-list-test.el +++ b/test/automated/tabulated-list-test.el @@ -60,7 +60,7 @@ 4clojure 4clojure 1507 obsolete Open and evaluate 4clojure.com questions abc-mode abc-mode 944 available Major mode for editing abc music files mode mode 1128 installed A simple mode for editing Actionscript 3 files\n")) - ;; Preseve position. + ;; Preserve position. (forward-line 3) (let ((pos (thing-at-point 'line))) (pop tabulated-list-entries) commit 100a96c92ba9cdf49f695edcf74975321eafae2e Author: Mark Oteiza Date: Wed Oct 14 17:32:47 2015 -0400 * lisp/mpc.el (mpc-mode-menu, mpc-toggle-play): Fix docstrings diff --git a/lisp/mpc.el b/lisp/mpc.el index 0f8283a..f83b478 100644 --- a/lisp/mpc.el +++ b/lisp/mpc.el @@ -1119,8 +1119,8 @@ If PLAYLIST is t or nil or missing, use the main playlist." "Menu for MPC.el." '("MPC.el" ["Play/Pause" mpc-toggle-play] - ["Next track" mpc-next] - ["Previous track" mpc-prev] + ["Next Track" mpc-next] + ["Previous Track" mpc-prev] ["Add new browser" mpc-tagbrowser] ["Update DB" mpc-update] ["Quit" mpc-quit])) @@ -2354,7 +2354,7 @@ This is used so that they can be compared with `eq', which is needed for (mpc-cmd-pause "0")) (defun mpc-toggle-play () - "Toggles between play and pause. + "Toggle between play and pause. If stopped, start playback." (interactive) (if (member (cdr (assq 'state (mpc-cmd-status))) '("stop")) commit e646242e13cd41742a3ff2acb7a0c3eec4e874e9 Author: Michael Albinus Date: Wed Oct 14 20:16:14 2015 +0200 Some editing fixes in Tramp * lisp/net/tramp-gvfs.el: * doc/misc/tramp.texi: "customer option" -> "custom option". * lisp/net/tramp.el (tramp-completion-function-alist): Fix docstring. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index ac2e74e..8658f6f 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -1015,7 +1015,7 @@ program is not found via the @env{PATH} environment variable, the variable @var{tramp-adb-program} must point to its absolute path. @value{tramp} does not connect Android devices to @command{adb}, -unless the customer option @option{tramp-adb-connect-if-not-connected} +unless the custom option @option{tramp-adb-connect-if-not-connected} is non-@code{nil}. If there is exactly one Android device connected to @command{adb}, a host name is not needed in the remote file name. The default @value{tramp} name to be used is @file{@trampfn{adb, , ,}}, @@ -1098,7 +1098,7 @@ FUSE, it also needs the SYNCE-GVFS plugin. @vindex tramp-gvfs-methods @defopt tramp-gvfs-methods -This customer option, a list, defines the external methods which shall +This custom option, a list, defines the external methods which shall be used with GVFS@. Per default, these are @option{dav}, @option{davs}, @option{obex}, @option{sftp} and @option{synce}. Other possible values are @option{ftp} and @option{smb}. @@ -1371,7 +1371,7 @@ bastion host. @vindex tramp-default-proxies-alist @defopt tramp-default-proxies-alist In order to specify multiple hops, it is possible to define a proxy -host to pass through, via the customer option +host to pass through, via the custom option @option{tramp-default-proxies-alist}. This variable keeps a list of triples (@var{host} @var{user} @var{proxy}). @@ -1486,7 +1486,7 @@ Sometimes they offer limited features only, like running @command{rbash} @vindex tramp-restricted-shell-hosts-alist @defopt tramp-restricted-shell-hosts-alist -This customer option keeps a list of regular expressions, which denote +This custom option keeps a list of regular expressions, which denote hosts running a registered shell like @command{rbash}. Those hosts can be used as proxies only. @@ -1827,7 +1827,7 @@ remote file access. @vindex tramp-own-remote-path @defopt tramp-remote-path When @value{tramp} connects to the remote host, it searches for the -programs that it can use. The customer option +programs that it can use. The custom option @option{tramp-remote-path} controls the directories searched on the remote host. @@ -2631,7 +2631,7 @@ changes, which would be invisible otherwise (@pxref{Connection caching}). @vindex tramp-completion-reread-directory-timeout @defopt tramp-completion-reread-directory-timeout -This customer option defines the number of seconds since last remote +This custom option defines the number of seconds since last remote command before rereading a directory contents. A value of 0 would require an immediate reread during file name completion, @code{nil} means to use always cached values for the directory contents. @@ -2672,7 +2672,7 @@ remotehost, /path}} would be sufficient from now on. @vindex tramp-save-ad-hoc-proxies @defopt tramp-save-ad-hoc-proxies -This customer option controls whether ad-hoc definitions are kept +This custom option controls whether ad-hoc definitions are kept persistently in @option{tramp-default-proxies-alist}. That means, those definitions are available also for future @value{emacsname} sessions. @@ -3704,8 +3704,8 @@ all hops, like @file{@trampfn{ssh, bird, bastion|ssh@value{postfixhop}news.my.domain, /opt/news/etc}}. Alternatively, if you save only the abbreviated multi-hop file name -@file{@trampfn{ssh, news, news.my.domain, /opt/news/etc}}, the -customer option @code{tramp-save-ad-hoc-proxies} must be set to a to a +@file{@trampfn{ssh, news, news.my.domain, /opt/news/etc}}, the custom +option @code{tramp-save-ad-hoc-proxies} must be set to a to a non-@code{nil} value. diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index b909142..463b997 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -47,7 +47,7 @@ ;; discovered during development time, is given in respective ;; comments. -;; The customer option `tramp-gvfs-methods' contains the list of +;; The custom option `tramp-gvfs-methods' contains the list of ;; supported connection methods. Per default, these are "dav", ;; "davs", "obex", "sftp" and "synce". Note that with "obex" it might ;; be necessary to pair with the other bluetooth device, if it hasn't @@ -81,7 +81,7 @@ ;; "synce" method), or from the zeroconf daemon (for the "dav", ;; "davs", and "sftp" methods). The zeroconf daemon is pre-configured ;; to discover services in the "local" domain. If another domain -;; shall be used for discovering services, the customer option +;; shall be used for discovering services, the custom option ;; `tramp-gvfs-zeroconf-domain' can be set accordingly. ;; Restrictions: diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index df64f49..15af0b5 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -485,7 +485,7 @@ names from FILE for completion. The following predefined FUNCTIONs exists: * `tramp-parse-netrc' for \"~/.netrc\" like files. * `tramp-parse-putty' for PuTTY registered sessions. -FUNCTION can also be a customer defined function. For more details see +FUNCTION can also be a user defined function. For more details see the info pages.") (defconst tramp-echo-mark-marker "_echo" commit 8318dec8e167a3c688534e3f9faff862b7e374ac Author: Michael Albinus Date: Wed Oct 14 20:10:14 2015 +0200 ; Submit changes promised last commit already diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index c02287d..1753c73 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -2457,16 +2457,17 @@ The method used must be an out-of-band method." (setq source (if t1 (tramp-make-copy-program-file-name v) (shell-quote-argument filename)) - target (funcall + target (if t2 + (tramp-make-copy-program-file-name v) + (shell-quote-argument + (funcall (if (and (file-directory-p filename) (string-equal (file-name-nondirectory filename) (file-name-nondirectory newname))) 'file-name-directory 'identity) - (if t2 - (tramp-make-copy-program-file-name v) - (shell-quote-argument newname)))) + newname)))) ;; Check for host and port number. We cannot use ;; `tramp-file-name-port', because this returns also commit 0cced99164baab5b56ee57e6b1dccea21164c85e Author: Jürgen Hötzel Date: Wed Oct 14 20:09:03 2015 +0200 Use proper localization in tramp-gvfs.el * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-attributes): Suppress localized settings in order to proper parse gfvs output. diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index b7b0a1c..b909142 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -791,6 +791,10 @@ file names." (ignore-errors ;; Don't modify `last-coding-system-used' by accident. (let ((last-coding-system-used last-coding-system-used) + (process-environment + (append + '("LANG=C.utf8" "LANGUAGE=C.utf8" "LC_ALL=C.utf8") + process-environment)) dirp res-symlink-target res-numlinks res-uid res-gid res-access res-mod res-change res-size res-filemodes res-inode res-device) (with-parsed-tramp-file-name filename nil commit 96764333c438566b20fd381960fef77fa12eb586 Author: Warren Lynn Date: Wed Oct 14 20:03:50 2015 +0200 Fix Bug#21562 * lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Quote argument in proper order. (Bug#21562) Copyright-paperwork-exempt: yes diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 7d24b54..c02287d 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4153,7 +4153,8 @@ process to set up. VEC specifies the connection." ;; Disable tab and echo expansion. (tramp-message vec 5 "Setting up remote shell environment") - (tramp-send-command vec "stty tab0 -inlcr -onlcr -echo kill '^U' erase '^H'" t) + (tramp-send-command + vec "stty tab0 -inlcr -onlcr -echo kill '^U' erase '^H'" t) ;; Check whether the echo has really been disabled. Some ;; implementations, like busybox of embedded GNU/Linux, don't ;; support disabling. commit 17d4f60b55dd7998a4afffa9413c9e1731791f1a Author: Nicolas Petton Date: Wed Oct 14 17:55:53 2015 +0200 Fix typos in docstrings * lisp/emacs-lisp/map.el: * lisp/emacs-lisp/seq.el: Fix typos in the docstrings of the pcase macros. diff --git a/lisp/emacs-lisp/map.el b/lisp/emacs-lisp/map.el index 7564463..cc437e0 100644 --- a/lisp/emacs-lisp/map.el +++ b/lisp/emacs-lisp/map.el @@ -50,7 +50,7 @@ Matches if the object is a map (list, hash-table or array), and each PATTERN matches the corresponding elements of the map. -Supernumerary elements of the map are ignore if less ARGS are +Supernumerary elements of the map are ignored if fewer ARGS are given, and the match does not fail. ARGS can be a list of the form (KEY PAT), in which case KEY in an diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el index d7c9c74..ce6645a 100644 --- a/lisp/emacs-lisp/seq.el +++ b/lisp/emacs-lisp/seq.el @@ -77,7 +77,7 @@ Evaluate BODY with VAR bound to each element of SEQ, in turn. Matches if the object is a sequence (list, string or vector), and each PATTERN matches the corresponding element of the sequence. -Supernumerary elements of the sequence are ignore if less +Supernumerary elements of the sequence are ignored if fewer PATTERNS are given, and the match does not fail." `(and (pred seq-p) ,@(seq--make-pcase-bindings patterns))) commit aebf282aec46e3e8246a3dce535ecccf173c391b Author: Mark Oteiza Date: Wed Oct 14 08:52:44 2015 -0400 * lisp/mpc.el (mpc-volume-refresh): Check if buffer is live. diff --git a/lisp/mpc.el b/lisp/mpc.el index d1524e7..0f8283a 100644 --- a/lisp/mpc.el +++ b/lisp/mpc.el @@ -1830,7 +1830,8 @@ A value of t means the main playlist.") (mpc-volume-widget (string-to-number (cdr (assq 'volume mpc-status))))) (let ((status-buf (mpc-proc-buffer (mpc-proc) 'status))) - (when status-buf (with-current-buffer status-buf (force-mode-line-update))))) + (when (buffer-live-p status-buf) + (with-current-buffer status-buf (force-mode-line-update))))) (defvar mpc-volume-step 5) commit c6cbf6c06cceaf1f8d855e070df3c3d5a0bdf8e6 Author: Glenn Morris Date: Wed Oct 14 06:22:34 2015 -0400 ; Auto-commit of loaddefs files. diff --git a/lisp/dired.el b/lisp/dired.el index b78b632..232abf6 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -3896,7 +3896,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "dired-aux" "dired-aux.el" "637aadf6baffb10be036ba4cec2372f9") +;;;### (autoloads nil "dired-aux" "dired-aux.el" "9565afd70e820a750c6452d45776005d") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ @@ -4089,7 +4089,9 @@ command with a prefix argument (the value does not matter). \(fn &optional ARG FMT)" t nil) (autoload 'dired-compress-file "dired-aux" "\ - +Compress or uncompress FILE. +Return the name of the compressed or uncompressed file. +Return nil if no change in files. \(fn FILE)" nil nil) @@ -4399,7 +4401,7 @@ instead. ;;;*** -;;;### (autoloads nil "dired-x" "dired-x.el" "63be23901985afd2a9aadc64f2aacf37") +;;;### (autoloads nil "dired-x" "dired-x.el" "06f532e2e812fa1cb10ade31249e9700") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ commit 0e38e94b1c4125951b198b213a67e010cafcd724 Author: Oleh Krehel Date: Wed Oct 14 11:19:21 2015 +0200 Make dired-jump work with tar-subfile-mode * lisp/dired-x.el (dired-jump): When in `tar-subfile-mode', instead of emitting an error, switch to `tar-superior-buffer'. diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 1b69091..b6704bb 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -402,6 +402,7 @@ See variables `dired-texinfo-unclean-extensions', dired-tex-unclean-extensions (list ".dvi")))) +(defvar tar-superior-buffer) ;;; JUMP. ;;;###autoload @@ -416,30 +417,32 @@ Interactively with prefix argument, read FILE-NAME and move to its line in dired." (interactive (list nil (and current-prefix-arg - (read-file-name "Jump to Dired file: ")))) - (let* ((file (or file-name buffer-file-name)) - (dir (if file (file-name-directory file) default-directory))) - (if (and (eq major-mode 'dired-mode) (null file-name)) - (progn - (setq dir (dired-current-directory)) - (dired-up-directory other-window) - (unless (dired-goto-file dir) - ;; refresh and try again - (dired-insert-subdir (file-name-directory dir)) - (dired-goto-file dir))) - (if other-window - (dired-other-window dir) - (dired dir)) - (if file - (or (dired-goto-file file) + (read-file-name "Jump to Dired file: ")))) + (if (bound-and-true-p tar-subfile-mode) + (switch-to-buffer tar-superior-buffer) + (let* ((file (or file-name buffer-file-name)) + (dir (if file (file-name-directory file) default-directory))) + (if (and (eq major-mode 'dired-mode) (null file-name)) + (progn + (setq dir (dired-current-directory)) + (dired-up-directory other-window) + (unless (dired-goto-file dir) ;; refresh and try again - (progn - (dired-insert-subdir (file-name-directory file)) - (dired-goto-file file)) - ;; Toggle omitting, if it is on, and try again. - (when dired-omit-mode - (dired-omit-mode) - (dired-goto-file file))))))) + (dired-insert-subdir (file-name-directory dir)) + (dired-goto-file dir))) + (if other-window + (dired-other-window dir) + (dired dir)) + (if file + (or (dired-goto-file file) + ;; refresh and try again + (progn + (dired-insert-subdir (file-name-directory file)) + (dired-goto-file file)) + ;; Toggle omitting, if it is on, and try again. + (when dired-omit-mode + (dired-omit-mode) + (dired-goto-file file)))))))) ;;;###autoload (defun dired-jump-other-window (&optional file-name)