diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-11-28 22:55:31 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-11-28 23:07:16 -0800 |
| commit | 0cce3623b169732a51f055a86fc926313b11a5ee (patch) | |
| tree | 17154977d6e77f604ede0b82f89b2aeb6925310a /lisp | |
| parent | 9875d23d86c0668b1e697b67a394560d66c7826d (diff) | |
| parent | 6b765b8facbdbb03f28028007885236601652515 (diff) | |
| download | emacs-0cce3623b169732a51f055a86fc926313b11a5ee.tar.gz | |
Merge branch 'emacs-24'.
Diffstat (limited to 'lisp')
54 files changed, 338 insertions, 282 deletions
diff --git a/lisp/.gitignore b/lisp/.gitignore deleted file mode 100644 index 6d5166e1349..00000000000 --- a/lisp/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -*.elc -*-loaddefs.el -loaddefs.el -subdirs.el -finder-inf.el -cus-load.el diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 782481f8d0c..2a450a7acff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,104 @@ +2014-11-29 Stephen Berman <stephen.berman@gmx.net> + Stefan Monnier <monnier@iro.umontreal.ca> + + * outline.el (outline-move-subtree-down): Make sure we can move + forward to find the end of the subtree and the insertion point + (bug#19102). + +2014-11-29 Leonard Randall <leonard.a.randall@gmail.com> + + * textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search + for comment lines non-greedy and stopping at newlines to fix stack + overflows with large files. [Backport] + +2014-11-29 Fabián Ezequiel Gallina <fgallina@gnu.org> + + * progmodes/python.el (python-shell-completion-setup-code): Use + __builtin__ module (or builtins in Python 3) and catch all errors + when importing readline and rlcompleter. + +2014-11-29 Stephen Berman <stephen.berman@gmx.net> + + * calendar/todo-mode.el: Handle calling revert-buffer (bug#19187). + (todo-revert-buffer): New function. + (todo-modes-set-1): Use it as the buffer-local value of + revert-buffer-function. + +2014-11-29 Stephen Berman <stephen.berman@gmx.net> + + * calendar/todo-mode.el (todo-mode): If called interactively, just + display a message saying to call todo-show to enter Todo mode + (Bug#19112). + +2014-11-29 Dmitry Gutov <dgutov@yandex.ru> + + * vc/vc-hg.el (vc-hg-dir-status-files): Include ignored files. + (Bug#18579) + + * vc/vc-bzr.el (vc-bzr-after-dir-status): Don't skip ignored + files. (Bug#18579) + +2014-11-29 Michael Albinus <michael.albinus@gmx.de> + + * textmodes/makeinfo.el (makeinfo-buffer): Make it work also for + remote `buffer-file-name'. + +2014-11-29 Leo Liu <sdl.web@gmail.com> + + * calendar/diary-lib.el (calendar-mark-1): Fix thinko. + +2014-11-29 Fabián Ezequiel Gallina <fgallina@gnu.org> + + Set PYTHONUNBUFFERED on shell startup. + + * progmodes/python.el (python-shell-unbuffered): New var. + (python-shell-calculate-process-environment): Use it. + +2014-11-29 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-action-password): Clean password on subsequent + attempts even if there was no wrong password indication. (Bug#19047) + + * net/tramp-sh.el (tramp-get-remote-locale): Return "LC_ALL=C" as + fallback. + (tramp-open-connection-setup-interactive-shell): No need to check + for nil as `tramp-get-remote-locale' return value. + +2014-11-29 Eli Zaretskii <eliz@gnu.org> + + * vc/vc-git.el (vc-git-command, vc-git--call): Bind + coding-system-for-read and coding-system-for-write to + vc-git-commits-coding-system. + (vc-git-previous-revision): Use "~1" instead of "^", since the + latter is a special character for MS-Windows system shells. + +2014-11-29 Michael Albinus <michael.albinus@gmx.de> + + Improve XEmacs compatibility. + + * net/tramp.el (tramp-autoload-file-name-handler): + Wrap `temporary-file-directory' by `symbol-value', it doesn't + exist in XEmacs. + (tramp-read-passwd): Don't use `with-timeout-suspend' and + `with-timeout-unsuspend' if they don't exist, like in XEmacs. + (tramp-time-less-p, tramp-time-subtract): Remove functions. + (tramp-handle-file-newer-than-file-p, tramp-time-diff): + * net/tramp-adb.el (tramp-adb-ls-output-time-less-p): + * net/tramp-cache.el (tramp-get-file-property): + * net/tramp-smb.el (tramp-smb-handle-insert-directory): + Use `time-less-p' and `time-subtract, respectively. + + * net/tramp-adb.el (top): Do not require time-date.el. + + * net/tramp-compat.el (top): Require time-date.el for XEmacs. + + * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell): + Check, whether `utf-8' is a valid coding system. + +2014-11-29 Eli Zaretskii <eliz@gnu.org> + + * vc/vc.el (vc-retrieve-tag): Doc fix. + 2014-11-28 Stefan Monnier <monnier@iro.umontreal.ca> * simple.el (execute-extended-command--shorter): Fix the "M-p" case @@ -4561,7 +4662,7 @@ (bug#17818). * mouse.el (mouse-drag-line): Don't re-add to unread-comment-events, - since it's already done inside the loop (bug#17819). + since it's already done inside the loop (bug#17819). 2014-06-21 Martin Rudalics <rudalics@gmx.at> @@ -5669,7 +5770,7 @@ * vc/emerge.el (emerge-make-temp-file): Simplify. 2014-05-14 Stephen Berman <stephen.berman@gmx.net> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> * minibuffer.el (completion-pcm--merge-try): Merge trailing / with suffix (bug#15419). diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 5699c90cb80..309fa14c021 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -32494,7 +32494,7 @@ (bibtex-field-list, bibtex-find-crossref): Fix typos in error messages. 2005-01-24 Dan Nicolaescu <dann@ics.uci.edu> - Juri Linkov <juri@jurta.org> + Juri Linkov <juri@jurta.org> * textmodes/reftex-global.el (reftex-isearch-push-state-function) (reftex-isearch-pop-state-function, reftex-isearch-isearch-search) diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index f6bdc4326e0..e0adfdd2cee 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -3984,7 +3984,7 @@ * ibuffer.el (ibuffer-mode): Fix typo in previous change. 2008-01-17 Vinicius Jose Latorre <viniciusjl@ig.com.br> - Miles Bader <miles@gnu.org> + Miles Bader <miles@gnu.org> * blank-mode.el: New file. Minor mode to visualize (HARD) SPACE, TAB, NEWLINE. Miles Bader <miles@gnu.org> wrote the original code @@ -5480,7 +5480,7 @@ (verilog-insert-indices): Escape braces in doc strings. 2007-12-08 Michael McNamara <mac@verilog.com> - Wilson Snyder <wsnyder@wsnyder.org> + Wilson Snyder <wsnyder@wsnyder.org> * progmodes/verilog-mode.el: New file. @@ -13486,7 +13486,7 @@ Use native Emacs functions, when appropriate. 2007-08-01 Dan Nicolaescu <dann@ics.uci.edu> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> * vc.el: Document new VC operation `extra-menu'. diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index 3c2a7ff7ee3..3ca5d716bc3 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -3016,12 +3016,12 @@ Don't activate node nil. (Bug#1569) 2009-01-22 Paul Reilly <pmr@pajato.com> - Henrik Enberg <enberg@printf.se> - Alex Schroeder <alex@gnu.org> - Chong Yidong <cyd@stupidchicken.com> - Richard M Stallman <rms@gnu.org> - Glenn Morris <rgm@gnu.org> - Juanma Barranquero <lekktu@gmail.com> + Henrik Enberg <enberg@printf.se> + Alex Schroeder <alex@gnu.org> + Chong Yidong <cyd@stupidchicken.com> + Richard M Stallman <rms@gnu.org> + Glenn Morris <rgm@gnu.org> + Juanma Barranquero <lekktu@gmail.com> * mail/rmail.el: Code implementing Rmail-mbox functionality. (rmail-attribute-header, rmail-keyword-header) @@ -4314,7 +4314,7 @@ was orderly adjusted, nil otherwise. 2008-12-12 Juanma Barranquero <lekktu@gmail.com> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> * server.el (server-sentinel): Uncomment code to delete connection file. (server-start): Save the connection file in the server property list. @@ -4373,7 +4373,7 @@ terminal variable assignment. 2008-12-10 Yukihiro Matsumoto <matz@ruby-lang.org> - Nobuyoshi Nakada <nobu@ruby-lang.org> + Nobuyoshi Nakada <nobu@ruby-lang.org> * progmodes/ruby-mode.el: New file. @@ -5603,7 +5603,7 @@ New aliases, to satisfy `define-derived-mode' expectations. 2008-11-15 Glenn Morris <rgm@gnu.org> - Martin Rudalics <rudalics@gmx.at> + Martin Rudalics <rudalics@gmx.at> * emacs-lisp/find-func.el (find-function-advised-original): New. (find-function-C-source, find-function-noselect): @@ -10312,8 +10312,8 @@ (newsticker--treeview-propertize-tag): Show item title in tooltip. 2008-06-20 Martin Blais <blais@furius.ca> - Stefan Merten <smerten@oekonux.de> - David Goodger <goodger@python.org> + Stefan Merten <smerten@oekonux.de> + David Goodger <goodger@python.org> * textmodes/rst.el: New file. @@ -10631,7 +10631,7 @@ * term/linux.el (terminal-init-linux): Load t-mouse. 2008-06-13 Stefan Monnier <monnier@iro.umontreal.ca> - Drew Adams <drew.adams@oracle.com> + Drew Adams <drew.adams@oracle.com> * info.el (Info-breadcrumbs-depth): New var. (Info-insert-breadcrumbs): New function. @@ -18798,7 +18798,7 @@ for useful options. 2008-03-01 Dan Nicolaescu <dann@ics.uci.edu> - Glenn Morris <rgm@gnu.org> + Glenn Morris <rgm@gnu.org> * emacs-lisp/bytecomp.el (byte-recompile-directory) (byte-compile-file, batch-byte-compile, batch-byte-compile-file): diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index 9c793ff4615..7589061c70b 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -628,7 +628,7 @@ (global-auto-revert-ignore-buffer): Remove leading "*" from docs. 2011-02-19 Dmitry Bolshakov <dmitry.bolshakov@bridge-quest.com> - Dima Kogan <dkogan@cds.caltech.edu> (tiny change) + Dima Kogan <dkogan@cds.caltech.edu> (tiny change) * progmodes/hideshow.el (hs-find-block-beginning) (hs-hide-level-recursive): Ignore comments when parsing braces @@ -2970,7 +2970,7 @@ * loadup.el (symbol-file-load-history-loaded): Remove; unused. 2010-12-15 Jari Aalto <jari.aalto@cante.net> - Scott Evans <gse@antisleep.com> + Scott Evans <gse@antisleep.com> * rect.el (rectange--default-line-number-format) (rectangle-number-line-callback): New functions. @@ -7986,7 +7986,7 @@ * iswitchb.el (iswitchb-kill-buffer): Re-make the list. 2010-08-22 Kirk Kelsey <kirk.kelsey@0x4b.net> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> * progmodes/make-mode.el (makefile-fill-paragraph): Account for the extra backslash added to each line (bug#6890). @@ -9002,7 +9002,7 @@ another buffer (e.g gnus-art). 2010-07-13 Karl Fogel <kfogel@red-bean.com> - Thierry Volpiatto <thierry.volpiatto@gmail.com> + Thierry Volpiatto <thierry.volpiatto@gmail.com> Preparation for setting bookmarks in Gnus article buffers (Bug#5975). @@ -10301,7 +10301,7 @@ (rcirc-user-name-history): Add variable. 2010-05-25 Ryan Yeske <rcyeske@gmail.com> - Jonathan Rockway <jon@jrock.us> + Jonathan Rockway <jon@jrock.us> * net/rcirc.el (rcirc-server-alist): Add :pass. (rcirc): When prompting for connection parameters, also prompt for @@ -10969,7 +10969,7 @@ * Version 23.2 released. 2010-05-07 Deniz Dogan <deniz.a.m.dogan@gmail.com> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> Highlight vendor specific properties. * textmodes/css-mode.el (css-proprietary-nmstart-re): New var. @@ -11162,7 +11162,7 @@ (filter-buffer-substring): Use it. Remove unused arg `noprops'. 2010-05-01 Toru TSUNEYOSHI <t_tuneyosi@hotmail.com> - Michael Albinus <michael.albinus@gmx.de> + Michael Albinus <michael.albinus@gmx.de> Implement compression for inline methods. @@ -12209,7 +12209,7 @@ values. 2010-03-29 Phil Hagelberg <phil@evri.com> - Chong Yidong <cyd@stupidchicken.com> + Chong Yidong <cyd@stupidchicken.com> * subr.el: Extend progress reporters to perform "spinning". (progress-reporter-update, progress-reporter-do-update): @@ -15603,7 +15603,7 @@ * Makefile.in (ELCFILES): Adapt to subword.el move. 2009-11-21 Thierry Volpiatto <thierry.volpiatto@gmail.com> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> * bookmark.el (bookmark-bmenu-bookmark-column): Remove var. (bookmark-bmenu-list): Save name on `bookmark-name-prop' text-prop. @@ -19070,7 +19070,7 @@ indent buffer only if called interactively (Bug#4452). 2009-09-19 Juanma Barranquero <lekktu@gmail.com> - Eli Zaretskii <eliz@gnu.org> + Eli Zaretskii <eliz@gnu.org> This fixes bug#4197 (merged to bug#865, though not identical). * server.el (server-auth-dir): Add docstring note about FAT32. @@ -19887,7 +19887,7 @@ Don't call substitute-in-file-name on diary-file. 2009-09-03 Eduard Wiebe <usenet@pusto.de> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> * mail/footnote.el (footnote-prefix): Make it a defcustom. (footnote-mode-map): Move initialization into the declaration. @@ -20998,7 +20998,7 @@ * progmodes/hideshow.el (hs-special-modes-alist): Add js-mode entry. 2009-08-14 Daniel Colascione <dan.colascione@gmail.com> - Karl Landstrom <karl.landstrom@brgeight.se> + Karl Landstrom <karl.landstrom@brgeight.se> * progmodes/js.el: New file. @@ -22765,7 +22765,7 @@ XZ is the successor to LZMA: <http://tukaani.org/xz/> 2009-06-22 Dmitry Dzhus <dima@sphinx.net.ru> - Nick Roberts <nickrob@snap.net.nz> + Nick Roberts <nickrob@snap.net.nz> * progmodes/gdb-mi.el: Pull further modified changes from Dmitry's repository (http://sphinx.net.ru/hg/gdb-mi/). diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16 index 42f3a3be66f..06556847062 100644 --- a/lisp/ChangeLog.16 +++ b/lisp/ChangeLog.16 @@ -3340,7 +3340,7 @@ already registered with a different backend (Bug#10589). 2012-11-29 Jambunathan K <kjambunathan@gmail.com> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> * icomplete.el: Change separator; add ido-style commands. (icomplete-show-key-bindings): Remove custom var. @@ -4571,7 +4571,7 @@ to `bookmark' (bug#11131). 2012-10-26 Bastien Guerry <bzg@altern.org> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> * face-remap.el: Use lexical-binding. (text-scale-adjust): Improve docstring. Use itself for the temporary @@ -5879,7 +5879,7 @@ * international/uni-numeric.el: Regenerate. 2012-09-26 Tomohiro Matsuyama <tomo@cx4a.org> - Stefan Monnier <monnier@iro.umontreal.ca> + Stefan Monnier <monnier@iro.umontreal.ca> * profiler.el: New file. diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index dc2722105fe..c8e07b65368 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 @@ -3687,7 +3687,7 @@ When changing the environment, avoid need for setenv. 1996-01-05 Karl Eichwalder <ke@ke.Central.DE> - Karl Fogel <kfogel@floss.red-bean.com> + Karl Fogel <kfogel@floss.red-bean.com> * bookmark.el: "cyclic.com" addresses changed to "red-bean.com". (bookmark-bmenu-mode-map): Don't bind C-k. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 093f467163c..7c553970286 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -2749,7 +2749,7 @@ * abbrev.el: Likewise. 1998-05-26 Emilio Lopes <Emilio.Lopes@Physik.TU-Muenchen.DE> - Karl Fogel <kfogel@red-bean.com> + Karl Fogel <kfogel@red-bean.com> * bookmark.el: Changes so bookmark list mode works with Info: (bookmark-jump-noselect): Use an inner save-window-excursion. @@ -23110,8 +23110,7 @@ See ChangeLog.6 for earlier changes. ;; coding: utf-8 ;; End: - Copyright (C) 1997-1998, 2001-2014 Free Software Foundation, - Inc. + Copyright (C) 1997-1998, 2001-2014 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lisp/calc/.gitignore b/lisp/calc/.gitignore deleted file mode 100644 index a46b68dccbd..00000000000 --- a/lisp/calc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.elc -calc-loaddefs.el diff --git a/lisp/calendar/.gitignore b/lisp/calendar/.gitignore deleted file mode 100644 index d0de296c6e3..00000000000 --- a/lisp/calendar/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.elc -cal-loaddefs.el -diary-loaddefs.el -hol-loaddefs.el diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 39ba6f4617e..43f2ea48932 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -1586,8 +1586,7 @@ COLOR is passed to `calendar-mark-visible-date' as MARK." (setq date (calendar-gregorian-from-absolute (funcall toabs (list month day y))))) (calendar-mark-visible-date date color))))) - (calendar-mark-complex month day year - 'calendar-bahai-from-absolute color)))) + (calendar-mark-complex month day year fromabs color)))) (defun diary-entry-time (s) diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index ab12ebc17f0..3ba263f00e3 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -5194,6 +5194,15 @@ Overrides `diary-goto-entry'." (add-function :override diary-goto-entry-function #'todo-diary-goto-entry) +(defun todo-revert-buffer (&optional ignore-auto noconfirm) + "Call `revert-buffer', preserving buffer's current modes. +Also preserve category display, if applicable." + (interactive (list (not current-prefix-arg))) + (let ((revert-buffer-function nil)) + (revert-buffer ignore-auto noconfirm 'preserve-modes) + (when (memq major-mode '(todo-mode todo-archive-mode)) + (todo-category-select)))) + (defun todo-desktop-save-buffer (_dir) `((catnum . ,(todo-category-number (todo-current-category))))) @@ -6540,6 +6549,7 @@ Added to `window-configuration-change-hook' in Todo mode." (defun todo-modes-set-1 () "Make some settings that apply to multiple Todo modes." (setq-local font-lock-defaults '(todo-font-lock-keywords t)) + (setq-local revert-buffer-function 'todo-revert-buffer) (setq-local tab-width todo-indent-to-here) (setq-local indent-line-function 'todo-indent) (when todo-wrap-lines @@ -6573,23 +6583,24 @@ Added to `window-configuration-change-hook' in Todo mode." "Major mode for displaying, navigating and editing todo lists. \\{todo-mode-map}" - ;; (easy-menu-add todo-menu) - (todo-modes-set-1) - (todo-modes-set-2) - (todo-modes-set-3) - ;; Initialize todo-current-todo-file. - (when (member (file-truename (buffer-file-name)) - (funcall todo-files-function)) - (setq-local todo-current-todo-file (file-truename (buffer-file-name)))) - (setq-local todo-show-done-only nil) - (setq-local todo-categories-with-marks nil) - ;; (add-hook 'find-file-hook 'todo-add-to-buffer-list nil t) - (add-hook 'post-command-hook 'todo-update-buffer-list nil t) - (when todo-show-current-file - (add-hook 'pre-command-hook 'todo-show-current-file nil t)) - (add-hook 'window-configuration-change-hook - 'todo-reset-and-enable-done-separator nil t) - (add-hook 'kill-buffer-hook 'todo-reset-global-current-todo-file nil t)) + (if (called-interactively-p 'any) + (message "Type `M-x todo-show' to enter Todo mode") + (todo-modes-set-1) + (todo-modes-set-2) + (todo-modes-set-3) + ;; Initialize todo-current-todo-file. + (when (member (file-truename (buffer-file-name)) + (funcall todo-files-function)) + (setq-local todo-current-todo-file (file-truename (buffer-file-name)))) + (setq-local todo-show-done-only nil) + (setq-local todo-categories-with-marks nil) + ;; (add-hook 'find-file-hook 'todo-add-to-buffer-list nil t) + (add-hook 'post-command-hook 'todo-update-buffer-list nil t) + (when todo-show-current-file + (add-hook 'pre-command-hook 'todo-show-current-file nil t)) + (add-hook 'window-configuration-change-hook + 'todo-reset-and-enable-done-separator nil t) + (add-hook 'kill-buffer-hook 'todo-reset-global-current-todo-file nil t))) (put 'todo-archive-mode 'mode-class 'special) diff --git a/lisp/cedet/.gitignore b/lisp/cedet/.gitignore deleted file mode 100644 index 976586eb53b..00000000000 --- a/lisp/cedet/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -## Generated grammar files. -semantic/bovine/c-by.el -semantic/bovine/make-by.el -semantic/bovine/scm-by.el -semantic/wisent/javat-wy.el -semantic/wisent/js-wy.el -semantic/wisent/python-wy.el -srecode/srt-wy.el diff --git a/lisp/emulation/.gitignore b/lisp/emulation/.gitignore deleted file mode 100644 index c531d9867f6..00000000000 --- a/lisp/emulation/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/erc/.gitignore b/lisp/erc/.gitignore deleted file mode 100644 index 7053c310135..00000000000 --- a/lisp/erc/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -{arch} -.arch-ids -*.elc diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 2004de41d0b..d4dee671439 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -106,7 +106,7 @@ (erc-channel-user): Add members for new modes. (erc-channel-member-halfop-p, erc-channel-user-admin-p) (erc-channel-user-owner-p): Use new struct members. - (erc-format-nick, erc-format-@nick): Display user modes as nick prefix. + (erc-format-nick, erc-format-@nick): Display user modes as nick prefix. (erc-nick-prefix-face, erc-my-nick-prefix-face): Add new faces (erc-get-user-mode-prefix): Return symbol for mode prefix. (erc-update-channel-member, erc-update-current-channel-member) diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02 index 77d4855abc2..1b4a52c12e0 100644 --- a/lisp/erc/ChangeLog.02 +++ b/lisp/erc/ChangeLog.02 @@ -2091,7 +2091,7 @@ * erc.el 2002-07-15T00:01:34Z!raeburn@raeburn.org: silly typo corrected - * erc.el: * erc.el: * New variable: erc-common-server-name-suffixes + * erc.el: New variable: erc-common-server-name-suffixes This alist can be used to change the server names displayed in mode-line to a shorter version.. * New function: erc-shorten-server-name (uses var above) diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03 index 5f04cf8ebe5..029e29e4728 100644 --- a/lisp/erc/ChangeLog.03 +++ b/lisp/erc/ChangeLog.03 @@ -323,7 +323,7 @@ * erc.el(erc-modules): Add some more symbols to the set - * erc.el(erc-modules): * erc.el(erc-modules): Add :greedy t to the set in + * erc.el(erc-modules): Add :greedy t to the set in * erc-dcc.el: More autoloads which make dcc autoload upon ctcp dcc query received. @@ -714,7 +714,7 @@ defcustom `erc-log-insert-log-on-open' defcustom `erc-generate-log-file-name-function' defun `erc-save-buffer-in-logs' (autoloads from erc-log.el) - defuns `erc-generate-log-file-name-*' + defuns `erc-generate-log-file-name-*' defun `erc-current-logfile' defun `erc-logging-enabled' (autoloads from erc-log.el) - erc-truncate-buffer-to-size: fix for double-saving bug when @@ -744,7 +744,7 @@ 2003-04-27 Damien Elmes <erc@repose.cx> - * erc.el: * erc.el: erc-modules: added + * erc.el: erc-modules: added 2003-04-27 Alex Schroeder <alex@gnu.org> @@ -1567,7 +1567,7 @@ * (erc-cmd-NAMES): Ditto. * (erc-cmd-ME): Put 'do-not-parse-args property. - * erc-dcc.el:nick: * erc-dcc.el: * erc-dcc-list: Renamed + * erc-dcc-list: Renamed * (erc-dcc-member). Treat :nick as either a nick!user@host or nick, do appropriate comparisons, simplified. * (erc-dcc-list-add): New functions @@ -1692,12 +1692,12 @@ 2003-01-11 Mario Lang <mlang@delysid.org> - * erc-dcc.el: * erc-dcc.el: * (erc-dcc-do-LIST-command): Fix + * erc-dcc.el (erc-dcc-do-LIST-command): Fix * erc-dcc.el: * buffer-local variables erc-dcc-sent-marker and erc-dcc-send-confirmed marker removed Keep This info in erc-dcc-member :sent and :confirmed plist values - * : * :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer + :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer * erc-dcc-send-connect-hook: New hook, defaults to erc-dcc-send-block and erc-dcc-send-connected, which now prints a msg... * erc-dcc.el: diff --git a/lisp/eshell/.gitignore b/lisp/eshell/.gitignore deleted file mode 100644 index 2abf84ba3ee..00000000000 --- a/lisp/eshell/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -esh-groups.el - diff --git a/lisp/gnus/.gitignore b/lisp/gnus/.gitignore deleted file mode 100644 index c531d9867f6..00000000000 --- a/lisp/gnus/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 736cb4ee29a..e2b26684c6d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2014-11-29 John Mastro <john.b.mastro@gmail.com> (tiny change) + + * auth-source.el (auth-source-macos-keychain-search-items): Return + result of `auth-source-macos-keychain-result-append' (bug#19074). + 2014-11-27 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-art.el (gnus-use-idna): diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1 index 540db9d2914..4ed24cef073 100644 --- a/lisp/gnus/ChangeLog.1 +++ b/lisp/gnus/ChangeLog.1 @@ -386,11 +386,11 @@ * gnus-start.el (gnus-save-newsrc-file): Use coding system. -1980-06-08 Mike McEwan <mike@lotusland.demon.co.uk> +1998-08-18 Mike McEwan <mike@lotusland.demon.co.uk> * gnus-agent.el (gnus-agent-braid-nov): Go to right place. -1980-06-08 Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp> +1998-08-18 Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp> * gnus-group.el (gnus-group-suspend): Fix. @@ -638,7 +638,7 @@ 1998-08-09 Simon Josefsson <jas@pdc.kth.se> - * gnus-srvr.el (gnus-browse-make-menu-bar): select did read + * gnus-srvr.el (gnus-browse-make-menu-bar): select did read 1998-08-09 Lars Magne Ingebrigtsen <larsi@gnus.org> @@ -794,7 +794,7 @@ 1998-07-19 16:59 Simon Josefsson <jas@pdc.kth.se> - * gnus-util.el (gnus-netrc-syntax-table): @ is whitespace + * gnus-util.el (gnus-netrc-syntax-table): @ is whitespace 1998-07-17 Gordon Matzigkeit <gord@fig.org> @@ -972,7 +972,7 @@ 1998-07-01 Simon Josefsson <jas@pdc.kth.se> * gnus-int.el (gnus-get-function): returned non-nil when - function wasn't bound, if noerror=t + function wasn't bound, if noerror=t 1998-07-01 Lars Magne Ingebrigtsen <larsi@ifi.uio.no> @@ -1260,8 +1260,8 @@ 1998-06-09 Sam Steingold <sds@goems.com> - * gnus-uu.el (gnus-uu-default-view-rules): make sed kill ^M only - at the end of line. + * gnus-uu.el (gnus-uu-default-view-rules): make sed kill ^M only + at the end of line. 1998-06-05 Hrvoje Niksic <hniksic@srce.hr> @@ -1798,7 +1798,7 @@ 1998-03-18 Simon Josefsson <jas@pdc.kth.se> - * nndoc.el: dummy request-accept-article + * nndoc.el: dummy request-accept-article 1998-03-19 Lars Magne Ingebrigtsen <larsi@ifi.uio.no> @@ -2316,9 +2316,9 @@ 1998-01-17 Simon Josefsson <jas@pdc.kth.se> - * gnus-sum.el (gnus-summary-work-articles): change buffer - before looking at marked articles - (gnus-summary-work-articles): better check of marked articles + * gnus-sum.el (gnus-summary-work-articles): change buffer + before looking at marked articles + (gnus-summary-work-articles): better check of marked articles 1998-02-14 Lars Magne Ingebrigtsen <larsi@ifi.uio.no> @@ -2607,7 +2607,7 @@ 1997-12-22 Simon Josefsson <jas@faun.nada.kth.se> - * nnmail.el (nnmail-get-new-mail): Make nnmail-tmp-directory + * nnmail.el (nnmail-get-new-mail): Make nnmail-tmp-directory 1997-12-28 Per Abrahamsen <abraham@dina.kvl.dk> diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 37d1c1d9f7a..e54cc153eb7 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -15652,12 +15652,12 @@ * mm-util.el, message.el, rfc2047.el, gnus-sum.el, gnus-score.el: Sync with Emacs 21 (tag EMACS_PRETEST_21_0_100). -;;Has been fixed -- zsh. -;;2001-03-05 Dave Love <fx@gnu.org> -;; -;; * mm-util.el (mm-mime-mule-charset-alist): Fix utf-8 case. -;; Move it after definition of mm-coding-system-p. -;; + ;;Has been fixed -- zsh. + ;;2001-03-05 Dave Love <fx@gnu.org> + ;; + ;; * mm-util.el (mm-mime-mule-charset-alist): Fix utf-8 case. + ;; Move it after definition of mm-coding-system-p. + ;; 2001-03-01 Dave Love <fx@gnu.org> * mm-util.el (mm-inhibit-file-name-handlers): @@ -16129,9 +16129,9 @@ * mm-util.el (mm-multibyte-string-p): New. -;; * qp.el: Remove un-logged bogus changes from 2000-12-20. -;; (quoted-printable-encode-region): Doc fix. Don't call -;; string-as-multibyte on class. Clarify line-folding. + ;; * qp.el: Remove un-logged bogus changes from 2000-12-20. + ;; (quoted-printable-encode-region): Doc fix. Don't call + ;; string-as-multibyte on class. Clarify line-folding. (quoted-printable-encode-string): Make temp buffer inherit string's multibyteness. @@ -16972,10 +16972,10 @@ * nnlistserv.el: Ignore errors when requiring nnweb and avoid a compiler warning. -;2000-11-26 Dave Love <fx@gnu.org> -; -; * mm-uu.el (mm-uu-configure-list): Fix typo in :type. -; + ;2000-11-26 Dave Love <fx@gnu.org> + ; + ; * mm-uu.el (mm-uu-configure-list): Fix typo in :type. + ; 2000-11-23 Dave Love <fx@gnu.org> * uu-post.pbm, uu-decode.pbm: New files from XPMs. @@ -17008,7 +17008,7 @@ * gnus-art.el (gnus-mime-button-map): Don't inherit from gnus-article-mode-map. -; (gnus-mime-button-menu): Use mouse-set-point. + ; (gnus-mime-button-menu): Use mouse-set-point. (gnus-insert-mime-button, gnus-mime-display-alternative) (gnus-mime-display-alternative): Don't use local-map property. @@ -17072,9 +17072,9 @@ * time-date.el (timezone-make-date-arpa-standard): Autoload. (date-to-time): Use it. -; * message.el (message-mode) <adaptive-fill-regexp>: -; <adaptive-fill-first-line-regexp>: Use [:alnum:] in regexp range. -; (message-newline-and-reformat): Likewise. + ; * message.el (message-mode) <adaptive-fill-regexp>: + ; <adaptive-fill-first-line-regexp>: Use [:alnum:] in regexp range. + ; (message-newline-and-reformat): Likewise. (message-forward-as-mime, message-forward-ignored-headers) (message-buffer-naming-style, message-default-charset) (message-dont-reply-to-names, message-send-mail-partially-limit): @@ -17179,16 +17179,16 @@ (uudecode-char-int): New alias, replacing char-int. (uudecode-decode-region): Don't call buffer-disable-undo. -; * mm-uu.el (mm-uu-configure): Unquote lambda. -; (mm-uu-configure-list): Doc fix. -; -; * earcon.el (running-xemacs): Don't define. -; -;2000-11-03 Stefan Monnier <monnier@cs.yale.edu> -; -; * message.el (message-font-lock-keywords): Match a final newline -; to help font-lock's multiline support. -; + ; * mm-uu.el (mm-uu-configure): Unquote lambda. + ; (mm-uu-configure-list): Doc fix. + ; + ; * earcon.el (running-xemacs): Don't define. + ; + ;2000-11-03 Stefan Monnier <monnier@cs.yale.edu> + ; + ; * message.el (message-font-lock-keywords): Match a final newline + ; to help font-lock's multiline support. + ; 2000-11-03 Dave Love <fx@gnu.org> * gnus-nocem.el (gnus-nocem-check-article-limit): Default to 500. @@ -17202,10 +17202,10 @@ * mm-decode.el (mm-display-external): Space-prefix temp buffer name. Don't disable undo explicitly. -;2000-11-02 Dave Love <fx@gnu.org> -; -; * message.el (message-font-lock-keywords): Use [:alpha:] for -; cite-prefix. + ;2000-11-02 Dave Love <fx@gnu.org> + ; + ; * message.el (message-font-lock-keywords): Use [:alpha:] for + ; cite-prefix. 2000-11-01 Dave Love <fx@gnu.org> diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el index 2efb16b8611..a2a3b4fa257 100644 --- a/lisp/gnus/auth-source.el +++ b/lisp/gnus/auth-source.el @@ -1787,29 +1787,29 @@ entries for git.gnus.org: (while (not (eobp)) (cond ((looking-at "^password: \"\\(.+\\)\"$") - (auth-source-macos-keychain-result-append - ret - keychain-generic - "secret" - (lexical-let ((v (match-string 1))) - (lambda () v)))) + (setq ret (auth-source-macos-keychain-result-append + ret + keychain-generic + "secret" + (lexical-let ((v (match-string 1))) + (lambda () v))))) ;; TODO: check if this is really the label ;; match 0x00000007 <blob>="AppleID" ((looking-at "^[ ]+0x00000007 <blob>=\"\\(.+\\)\"") - (auth-source-macos-keychain-result-append - ret - keychain-generic - "label" - (match-string 1))) + (setq ret (auth-source-macos-keychain-result-append + ret + keychain-generic + "label" + (match-string 1)))) ;; match "crtr"<uint32>="aapl" ;; match "svce"<blob>="AppleID" ((looking-at "^[ ]+\"\\([a-z]+\\)\"[^=]+=\"\\(.+\\)\"") - (auth-source-macos-keychain-result-append - ret - keychain-generic - (match-string 1) - (match-string 2)))) - (forward-line))) + (setq ret (auth-source-macos-keychain-result-append + ret + keychain-generic + (match-string 1) + (match-string 2))))) + (forward-line))) ;; return `ret' iff it has the :secret key (and (plist-get ret :secret) (list ret)))) diff --git a/lisp/international/.gitignore b/lisp/international/.gitignore deleted file mode 100644 index 161b3125972..00000000000 --- a/lisp/international/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -# Generated Unicode files. -charprop.el -uni-bidi.el -uni-category.el -uni-combining.el -uni-comment.el -uni-decimal.el -uni-decomposition.el -uni-digit.el -uni-lowercase.el -uni-mirrored.el -uni-name.el -uni-numeric.el -uni-old-name.el -uni-titlecase.el -uni-uppercase.el diff --git a/lisp/language/.gitignore b/lisp/language/.gitignore deleted file mode 100644 index c531d9867f6..00000000000 --- a/lisp/language/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/leim/.gitignore b/lisp/leim/.gitignore deleted file mode 100644 index 57b77bad9ca..00000000000 --- a/lisp/leim/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -ja-dic/ -leim-list.el diff --git a/lisp/leim/quail/.gitignore b/lisp/leim/quail/.gitignore deleted file mode 100644 index c3f9e36f0db..00000000000 --- a/lisp/leim/quail/.gitignore +++ /dev/null @@ -1,22 +0,0 @@ -4Corner.el -ARRAY30.el -CCDOSPY.el -CTLau-b5.el -CTLau.el -ECDICT.el -ETZY.el -PY-b5.el -PY.el -Punct-b5.el -Punct.el -QJ-b5.el -QJ.el -SW.el -TONEPY.el -ZIRANMA.el -ZOZY.el -quick-b5.el -quick-cns.el -tsang-b5.el -tsang-cns.el - diff --git a/lisp/mail/.gitignore b/lisp/mail/.gitignore deleted file mode 100644 index c531d9867f6..00000000000 --- a/lisp/mail/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/mh-e/.gitignore b/lisp/mh-e/.gitignore deleted file mode 100644 index 2e5b1740f15..00000000000 --- a/lisp/mh-e/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -mh-autoloads.el -mh-cus-load.el -mh-loaddefs.el diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 242c8f0e071..d94cb99a8c8 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -2,7 +2,7 @@ * Merge in all changes up to 24.4 release. -2014-09-30 Bill Wohler <wohler@newt.com> +2014-09-30 Bill Wohler <wohler@newt.com> Release MH-E version 8.6. diff --git a/lisp/net/.gitignore b/lisp/net/.gitignore deleted file mode 100644 index c531d9867f6..00000000000 --- a/lisp/net/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index 2401b4af479..1695631d1ae 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -34,7 +34,6 @@ ;;; Code: (require 'tramp) -(require 'time-date) ;; Pacify byte-compiler. (defvar directory-sep-char) @@ -468,7 +467,7 @@ Emacs dired can't find files." (setq time-a (apply 'encode-time (parse-time-string (match-string 0 a)))) (string-match tramp-adb-ls-date-regexp b) (setq time-b (apply 'encode-time (parse-time-string (match-string 0 b)))) - (tramp-time-less-p time-b time-a))) + (time-less-p time-b time-a))) (defun tramp-adb-ls-output-name-less-p (a b) "Sort \"ls\" output by name, ascending." diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index a6b7500433b..50c8e249fe3 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -136,7 +136,7 @@ Returns DEFAULT if not set." (tramp-time-diff (current-time) (car value)) remote-file-name-inhibit-cache)) (and (consp remote-file-name-inhibit-cache) - (tramp-time-less-p + (time-less-p remote-file-name-inhibit-cache (car value))))) (setq value (cdr value)) (setq value default)) diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index cd336ec61b3..de63d8c7c7a 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -44,7 +44,8 @@ (require 'outline) (require 'passwd) (require 'pp) - (require 'regexp-opt)) + (require 'regexp-opt) + (require 'time-date)) (require 'advice) (require 'custom) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 8d7e046126c..c564988d370 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3992,9 +3992,9 @@ process to set up. VEC specifies the connection." (if (featurep 'mule) ;; Use MULE to select the right EOL convention for communicating ;; with the process. - (let ((cs (or (when (string-match - "utf8" (or (tramp-get-remote-locale vec) "")) - (cons 'utf-8 'utf-8)) + (let ((cs (or (and (memq 'utf-8 (coding-system-list)) + (string-match "utf8" (tramp-get-remote-locale vec)) + (cons 'utf-8 'utf-8)) (tramp-compat-funcall 'process-coding-system proc) (cons 'undecided 'undecided))) cs-decode cs-encode) @@ -4100,8 +4100,7 @@ process to set up. VEC specifies the connection." ;; Set the environment. (tramp-message vec 5 "Setting default environment") - (let ((env (append (when (tramp-get-remote-locale vec) ; Discard `(nil)'. - `(,(tramp-get-remote-locale vec))) + (let ((env (append `(,(tramp-get-remote-locale vec)) (copy-sequence tramp-remote-process-environment))) unset vars item) (while env @@ -5097,7 +5096,7 @@ Return ATTR." (defun tramp-get-remote-locale (vec) (with-tramp-connection-property vec "locale" (tramp-send-command vec "locale -a") - (let ((candidates '("en_US.utf8" "C.utf8" "C")) + (let ((candidates '("en_US.utf8" "C.utf8")) locale) (with-current-buffer (tramp-get-connection-buffer vec) (while candidates @@ -5107,7 +5106,7 @@ Return ATTR." candidates nil) (setq candidates (cdr candidates))))) ;; Return value. - (when locale (format "LC_ALL=%s" locale))))) + (format "LC_ALL=%s" (or locale "C"))))) (defun tramp-get-ls-command (vec) (with-tramp-connection-property vec "ls" diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 15ae9ed6fa8..3d48f47e58e 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -976,7 +976,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (lambda (x y) (if (string-match "t" switches) ;; Sort by date. - (tramp-time-less-p (nth 3 y) (nth 3 x)) + (time-less-p (nth 3 y) (nth 3 x)) ;; Sort by name. (string-lessp (nth 0 x) (nth 0 y)))))) @@ -1010,8 +1010,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (or (nth 3 attr) "nogroup") ; gid (or (nth 7 attr) (nth 2 x)) ; size (format-time-string - (if (tramp-time-less-p - (tramp-time-subtract (current-time) (nth 3 x)) + (if (time-less-p (time-subtract (current-time) (nth 3 x)) tramp-half-a-year) "%b %e %R" "%b %e %Y") diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 01cd8191169..fc9950d4a69 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2253,8 +2253,9 @@ Falls back to normal file name handler if no Tramp file name handler exists." ;;;###autoload (progn (defun tramp-autoload-file-name-handler (operation &rest args) "Load Tramp file name handler, and perform OPERATION." - ;; Avoid recursive loading of tramp.el. - (let ((default-directory temporary-file-directory)) + ;; Avoid recursive loading of tramp.el. `temporary-file-directory' + ;; does not exist in XEmacs, so we must use something else. + (let ((default-directory (or (symbol-value 'temporary-file-directory) "/"))) (load "tramp" nil t)) (apply operation args))) @@ -2968,8 +2969,8 @@ User is always nil." (cond ((not (file-exists-p file1)) nil) ((not (file-exists-p file2)) t) - (t (tramp-time-less-p (nth 5 (file-attributes file2)) - (nth 5 (file-attributes file1)))))) + (t (time-less-p (nth 5 (file-attributes file2)) + (nth 5 (file-attributes file1)))))) (defun tramp-handle-file-regular-p (filename) "Like `file-regular-p' for Tramp files." @@ -3444,9 +3445,9 @@ of." ;; Let's check whether a wrong password has been sent already. ;; Sometimes, the process returns a new password request ;; immediately after rejecting the previous (wrong) one. - (goto-char (point-min)) - (when (search-forward-regexp tramp-wrong-passwd-regexp nil t) + (unless (tramp-get-connection-property vec "first-password-request" nil) (tramp-clear-passwd vec)) + (goto-char (point-min)) (tramp-check-for-regexp proc tramp-password-prompt-regexp) (tramp-message vec 3 "Sending %s" (match-string 1)) ;; We don't call `tramp-send-string' in order to hide the @@ -4171,7 +4172,8 @@ Invokes `password-read' if available, `read-passwd' else." (tramp-check-for-regexp proc tramp-password-prompt-regexp) (format "%s for %s " (capitalize (match-string 1)) key)))) ;; We suspend the timers while reading the password. - (stimers (with-timeout-suspend)) + (stimers (and (functionp 'with-timeout-suspend) + (tramp-compat-funcall 'with-timeout-suspend))) auth-info auth-passwd) (unwind-protect @@ -4211,7 +4213,8 @@ Invokes `password-read' if available, `read-passwd' else." (read-passwd pw-prompt)) (tramp-set-connection-property v "first-password-request" nil))) ;; Reenable the timers. - (with-timeout-unsuspend stimers)))) + (and (functionp 'with-timeout-unsuspend) + (tramp-compat-funcall 'with-timeout-unsuspend stimers))))) ;;;###tramp-autoload (defun tramp-clear-passwd (vec) @@ -4237,16 +4240,6 @@ Invokes `password-read' if available, `read-passwd' else." "Alist mapping month names to integers.") ;;;###tramp-autoload -(defun tramp-time-less-p (t1 t2) - "Say whether time value T1 is less than time value T2." - (time-less-p (or t1 0) (or t2 0))) - -(defun tramp-time-subtract (t1 t2) - "Subtract two time values. -Return the difference in the format of a time value." - (time-subtract (or t1 0) (or t2 0))) - -;;;###tramp-autoload (defun tramp-time-diff (t1 t2) "Return the difference between the two times, in seconds. T1 and T2 are time values (as returned by `current-time' for example)." @@ -4264,7 +4257,7 @@ T1 and T2 are time values (as returned by `current-time' for example)." (if (< (length t1) 3) (append t1 '(0)) t1) (if (< (length t2) 3) (append t2 '(0)) t2))) (t - (let ((time (tramp-time-subtract t1 t2))) + (let ((time (time-subtract t1 t2))) (+ (* (car time) 65536.0) (cadr time) (/ (or (nth 2 time) 0) 1000000.0)))))) diff --git a/lisp/nxml/.gitignore b/lisp/nxml/.gitignore deleted file mode 100644 index f18ed02a937..00000000000 --- a/lisp/nxml/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.elc -subdirs.el diff --git a/lisp/obsolete/.gitignore b/lisp/obsolete/.gitignore deleted file mode 100644 index e69de29bb2d..00000000000 --- a/lisp/obsolete/.gitignore +++ /dev/null diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 0f50e574171..acb8470bf86 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -25397,7 +25397,7 @@ (org-ascii-replace-entities): New function. 2010-04-10 Carsten Dominik <carsten.dominik@gmail.com> - Ulf Stegemann <ulf@zeitform.de> + Ulf Stegemann <ulf@zeitform.de> * org-entities.el: New file. diff --git a/lisp/outline.el b/lisp/outline.el index c7cad31f572..61ee7ff0f9f 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -649,27 +649,32 @@ the match data is set appropriately." 'outline-get-last-sibling)) (ins-point (make-marker)) (cnt (abs arg)) + ;; Make sure we can move forward to find the end of the + ;; subtree and the insertion point. + (maybe-forward-char (lambda () + (if (eq (char-after) ?\n) (forward-char 1) + (if (and (eobp) (not (bolp))) (insert "\n"))))) beg end folded) - ;; Select the tree + ;; Select the tree. (outline-back-to-heading) (setq beg (point)) (save-match-data (save-excursion (outline-end-of-heading) (setq folded (outline-invisible-p))) (outline-end-of-subtree)) - (if (= (char-after) ?\n) (forward-char 1)) + (funcall maybe-forward-char) (setq end (point)) - ;; Find insertion point, with error handling + ;; Find insertion point, with error handling. (goto-char beg) (while (> cnt 0) (or (funcall movfunc) (progn (goto-char beg) - (error "Cannot move past superior level"))) + (user-error "Cannot move past superior level"))) (setq cnt (1- cnt))) (if (> arg 0) - ;; Moving forward - still need to move over subtree + ;; Moving forward - still need to move over subtree. (progn (outline-end-of-subtree) - (if (= (char-after) ?\n) (forward-char 1)))) + (funcall maybe-forward-char))) (move-marker ins-point (point)) (insert (delete-and-extract-region beg end)) (goto-char ins-point) diff --git a/lisp/play/.gitignore b/lisp/play/.gitignore deleted file mode 100644 index c531d9867f6..00000000000 --- a/lisp/play/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/progmodes/.gitignore b/lisp/progmodes/.gitignore deleted file mode 100644 index c531d9867f6..00000000000 --- a/lisp/progmodes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 9680a4aa9d5..b99e195f407 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -94,13 +94,13 @@ ;; python-shell-interpreter-args ;; "-i C:\\Python27\\Scripts\\ipython-script.py") -;; If you are experiencing missing or delayed output in your shells, -;; that's likely caused by your Operating System's pipe buffering -;; (e.g. this is known to happen running CPython 3.3.4 in Windows 7. +;; Missing or delayed output used to happen due to differences between +;; Operating Systems' pipe buffering (e.g. CPython 3.3.4 in Windows 7. ;; See URL `http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17304'). To -;; fix this, using CPython's "-u" commandline argument or setting the -;; "PYTHONUNBUFFERED" environment variable should help: See URL -;; `https://docs.python.org/3/using/cmdline.html#cmdoption-u'. +;; avoid this, the `python-shell-unbuffered' defaults to non-nil and +;; controls whether `python-shell-calculate-process-environment' +;; should set the "PYTHONUNBUFFERED" environment variable on startup: +;; See URL `https://docs.python.org/3/using/cmdline.html#cmdoption-u'. ;; The interaction relies upon having prompts for input (e.g. ">>> " ;; and "... " in standard Python shell) and output (e.g. "Out[1]: " in @@ -1824,6 +1824,14 @@ Restart the Python shell after changing this variable for it to take effect." :group 'python :safe 'booleanp) +(defcustom python-shell-unbuffered t + "Should shell output be unbuffered?. +When non-nil, this may prevent delayed and missing output in the +Python shell. See commentary for details." + :type 'boolean + :group 'python + :safe 'booleanp) + (defcustom python-shell-process-environment nil "List of environment variables for Python shell. This variable follows the same rules as `process-environment' @@ -2116,6 +2124,8 @@ uniqueness for different types of configurations." (virtualenv (if python-shell-virtualenv-root (directory-file-name python-shell-virtualenv-root) nil))) + (when python-shell-unbuffered + (setenv "PYTHONUNBUFFERED" "1")) (when python-shell-extra-pythonpaths (setenv "PYTHONPATH" (python-shell-calculate-pythonpath))) (if (not virtualenv) @@ -2849,25 +2859,30 @@ This function takes the list of setup code to send from the (defcustom python-shell-completion-setup-code "try: - import readline, rlcompleter + import __builtin__ except ImportError: + # Python 3 + import builtins as __builtin__ +try: + import readline, rlcompleter +except: def __PYTHON_EL_get_completions(text): return [] else: def __PYTHON_EL_get_completions(text): + builtins = dir(__builtin__) completions = [] try: splits = text.split() is_module = splits and splits[0] in ('from', 'import') - is_ipython = getattr( - __builtins__, '__IPYTHON__', - getattr(__builtins__, '__IPYTHON__active', False)) + is_ipython = ('__IPYTHON__' in builtins or + '__IPYTHON__active' in builtins) if is_module: from IPython.core.completerlib import module_completion completions = module_completion(text.strip()) - elif is_ipython and getattr(__builtins__, '__IP', None): + elif is_ipython and '__IP' in builtins: completions = __IP.complete(text) - elif is_ipython and getattr(__builtins__, 'get_ipython', None): + elif is_ipython and 'get_ipython' in builtins: completions = get_ipython().Completer.all_completions(text) else: i = 0 diff --git a/lisp/term/.gitignore b/lisp/term/.gitignore deleted file mode 100644 index c531d9867f6..00000000000 --- a/lisp/term/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/textmodes/.gitignore b/lisp/textmodes/.gitignore deleted file mode 100644 index c531d9867f6..00000000000 --- a/lisp/textmodes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.elc diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el index b97c6325bf8..3c8bc42cc10 100644 --- a/lisp/textmodes/makeinfo.el +++ b/lisp/textmodes/makeinfo.el @@ -253,11 +253,12 @@ Use the \\[next-error] command to move to the next error (setq makeinfo-output-node-name (makeinfo-current-node)) (save-excursion - (makeinfo-compile - (concat makeinfo-run-command " " makeinfo-options - " " buffer-file-name) - nil - 'makeinfo-compilation-sentinel-buffer))) + (let ((default-directory (file-name-directory buffer-file-name))) + (makeinfo-compile + (concat makeinfo-run-command " " makeinfo-options + " " (file-name-nondirectory buffer-file-name)) + nil + 'makeinfo-compilation-sentinel-buffer)))) (defun makeinfo-compilation-sentinel-buffer (proc msg) "Sentinel for `makeinfo-compile' run from `makeinfo-buffer'." diff --git a/lisp/url/.gitignore b/lisp/url/.gitignore deleted file mode 100644 index 362a9c89b75..00000000000 --- a/lisp/url/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -auto-autoloads.el -custom-load.el -url-auto.el diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 471c4799ca0..7a1539bb7e3 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -981,7 +981,7 @@ stream. Standard error output is discarded." (push (list new-name 'edited (vc-bzr-create-extra-fileinfo old-name)) result))) ;; do nothing for non existent files - ((memq translated '(not-found ignored))) + ((eq translated 'not-found)) (t (push (list (file-relative-name (buffer-substring-no-properties diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 75098904f32..3a943132435 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1084,7 +1084,11 @@ or BRANCH^ (where \"^\" can be repeated)." (point) (1- (point-max))))))) (or (vc-git-symbolic-commit prev-rev) prev-rev)) - (vc-git--rev-parse (concat rev "^")))) + ;; We used to use "^" here, but that fails on MS-Windows if git is + ;; invoked via a batch file, in which case cmd.exe strips the "^" + ;; because it is a special character for cmd which process-file + ;; does not (and cannot) quote. + (vc-git--rev-parse (concat rev "~1")))) (defun vc-git--rev-parse (rev) (with-temp-buffer @@ -1306,16 +1310,18 @@ This command shares argument histories with \\[rgrep] and \\[grep]." "A wrapper around `vc-do-command' for use in vc-git.el. The difference to vc-do-command is that this function always invokes `vc-git-program'." - (apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program - ;; http://debbugs.gnu.org/16897 - (unless (and (not (cdr-safe file-or-list)) - (let ((file (or (car-safe file-or-list) - file-or-list))) - (and file - (eq ?/ (aref file (1- (length file)))) - (equal file (vc-git-root file))))) - file-or-list) - (cons "--no-pager" flags))) + (let ((coding-system-for-read vc-git-commits-coding-system) + (coding-system-for-write vc-git-commits-coding-system)) + (apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program + ;; http://debbugs.gnu.org/16897 + (unless (and (not (cdr-safe file-or-list)) + (let ((file (or (car-safe file-or-list) + file-or-list))) + (and file + (eq ?/ (aref file (1- (length file)))) + (equal file (vc-git-root file))))) + file-or-list) + (cons "--no-pager" flags)))) (defun vc-git--empty-db-p () "Check if the git db is empty (no commit done yet)." @@ -1328,6 +1334,8 @@ The difference to vc-do-command is that this function always invokes ;; directories. We enable `inhibit-null-byte-detection', otherwise ;; Tramp's eol conversion might be confused. (let ((inhibit-null-byte-detection t) + (coding-system-for-read vc-git-commits-coding-system) + (coding-system-for-write vc-git-commits-coding-system) (process-environment (cons "PAGER=" process-environment))) (apply 'process-file vc-git-program nil buffer nil command args))) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 62d0bb5ba5f..d8cda912b61 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -639,7 +639,7 @@ REV is the revision to check out into WORKFILE." (vc-hg-after-dir-status update-function))) (defun vc-hg-dir-status-files (dir files _default-state update-function) - (apply 'vc-hg-command (current-buffer) 'async dir "status" "-C" files) + (apply 'vc-hg-command (current-buffer) 'async dir "status" "-mardui" "-C" files) (vc-run-delayed (vc-hg-after-dir-status update-function))) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index aa9337ccf35..bee16444728 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -2161,8 +2161,12 @@ checked out in that new branch." ;;;###autoload (defun vc-retrieve-tag (dir name) - "Descending recursively from DIR, retrieve the tag called NAME. -If NAME is empty, it refers to the latest revisions. + "For each file in or below DIR, retrieve their tagged version NAME. +NAME can name a branch, in which case this command will switch to the +named branch in the directory DIR. +Interactively, prompt for DIR only for VCS that works at file level; +otherwise use the default directory of the current buffer. +If NAME is empty, it refers to the latest revisions of the current branch. If locking is used for the files in DIR, then there must not be any locked files at or below DIR (but if NAME is empty, locked files are allowed and simply skipped)." |