------------------------------------------------------------ revno: 116406 committer: Michael Albinus branch nick: trunk timestamp: Tue 2014-02-11 09:31:39 +0100 message: * automated/tramp-tests.el (top): Require `vc', `vc-bzr', `vc-git' and `vc-hg'. Declare `tramp-find-executable' and `tramp-get-remote-path'. (tramp-test29-vc-registered): New test. (tramp-test30-utf8): Rename from `tramp-test29-utf8'. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2014-02-07 15:47:18 +0000 +++ test/ChangeLog 2014-02-11 08:31:39 +0000 @@ -1,3 +1,11 @@ +2014-02-11 Michael Albinus + + * automated/tramp-tests.el (top): Require `vc', `vc-bzr', `vc-git' + and `vc-hg'. Declare `tramp-find-executable' and + `tramp-get-remote-path'. + (tramp-test29-vc-registered): New test. + (tramp-test30-utf8): Rename from `tramp-test29-utf8'. + 2014-02-07 Michael Albinus * automated/tramp-tests.el (tramp-test26-process-file): Improve test. === modified file 'test/automated/tramp-tests.el' --- test/automated/tramp-tests.el 2014-02-07 15:56:15 +0000 +++ test/automated/tramp-tests.el 2014-02-11 08:31:39 +0000 @@ -37,6 +37,13 @@ (require 'ert) (require 'tramp) +(require 'vc) +(require 'vc-bzr) +(require 'vc-git) +(require 'vc-hg) + +(declare-function tramp-find-executable "tramp-sh") +(declare-function tramp-get-remote-path "tramp-sh") ;; There is no default value on w32 systems, which could work out of the box. (defconst tramp-test-temporary-file-directory @@ -1188,7 +1195,55 @@ (format "%s\n" (file-name-nondirectory tmp-name)) (buffer-string)))) (ignore-errors (delete-file tmp-name))))) -(ert-deftest tramp-test29-utf8 () +(ert-deftest tramp-test29-vc-registered () + "Check `vc-registered'." + (skip-unless (tramp--test-enabled)) + (skip-unless + (eq + (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory) + 'tramp-sh-file-name-handler)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + + (let* ((default-directory tramp-test-temporary-file-directory) + (tmp-name1 (tramp--test-make-temp-name)) + (tmp-name2 (expand-file-name "foo" tmp-name1)) + (vc-handled-backends + (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil + (cond + ((tramp-find-executable v vc-bzr-program (tramp-get-remote-path v)) + '(Bzr)) + ((tramp-find-executable v vc-git-program (tramp-get-remote-path v)) + '(Git)) + ((tramp-find-executable v vc-hg-program (tramp-get-remote-path v)) + '(Hg)) + (t nil))))) + (skip-unless vc-handled-backends) + (message "%s" vc-handled-backends) + + (unwind-protect + (progn + (make-directory tmp-name1) + (write-region "foo" nil tmp-name2) + (should (file-directory-p tmp-name1)) + (should (file-exists-p tmp-name2)) + (should-not (vc-registered tmp-name1)) + (should-not (vc-registered tmp-name2)) + + (let ((default-directory tmp-name1)) + ;; Create empty repository, and register the file. + (vc-create-repo (car vc-handled-backends)) + ;; The structure of VC-FILESET is not documented. Let's + ;; hope it won't change. + (vc-register + nil (list (car vc-handled-backends) + (list (file-name-nondirectory tmp-name2))))) + (should (vc-registered tmp-name2))) + + (ignore-errors (delete-directory tmp-name1 'recursive))))) + +(ert-deftest tramp-test30-utf8 () "Check UTF8 encoding in file names and file contents." (skip-unless (tramp--test-enabled)) (tramp-cleanup-connection @@ -1227,7 +1282,6 @@ ;; * make-auto-save-file-name ;; * set-file-acl ;; * set-file-selinux-context -;; * vc-registered ;; * Fix `tramp-test17-insert-directory' for ;; `ls-lisp-insert-directory' ("plink" and friends). ------------------------------------------------------------ revno: 116405 fixes bug: http://debbugs.gnu.org/13736 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Mon 2014-02-10 22:34:29 -0800 message: * text.texi (Editing Format Info): Use @samp for menus. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-02-09 03:38:18 +0000 +++ doc/emacs/ChangeLog 2014-02-11 06:34:29 +0000 @@ -1,3 +1,7 @@ +2014-02-11 Lars Ingebrigtsen + + * text.texi (Editing Format Info): Use @samp for menus (bug#13736). + 2014-02-09 Lars Ingebrigtsen * dired.texi (Hiding Subdirectories): Mention the node for === modified file 'doc/emacs/text.texi' --- doc/emacs/text.texi 2014-01-28 02:50:16 +0000 +++ doc/emacs/text.texi 2014-02-11 06:34:29 +0000 @@ -2099,11 +2099,12 @@ @node Editing Format Info @subsection Editing Format Information - The easiest way to alter properties is with the Text Properties -menu. You can get to this menu from the Edit menu in the menu bar -(@pxref{Menu Bar}), or with @kbd{C-Mouse-2} (@pxref{Menu Mouse -Clicks}). Some of the commands in the Text Properties menu are listed -below (you can also invoke them with @kbd{M-x}): + The easiest way to alter properties is with the @samp{Text +Properties} menu. You can get to this menu from the @samp{Edit} menu +in the menu bar (@pxref{Menu Bar}), or with @kbd{C-Mouse-2} +(@pxref{Menu Mouse Clicks}). Some of the commands in the @samp{Text +Properties} menu are listed below (you can also invoke them with +@kbd{M-x}): @table @code @findex facemenu-remove-face-props ------------------------------------------------------------ revno: 116404 committer: Paul Eggert branch nick: trunk timestamp: Mon 2014-02-10 14:15:54 -0800 message: Avoid "." at end of error diagnostics. * cmds.c (Fself_insert_command): Reword and avoid "." at end. * font.c (Ffont_at): * nsfns.m (ns_display_info_for_name): * nsselect.m (Fx_own_selection_internal): * nsterm.m (performDragOperation:): Remove "." from end of diagnostic. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-02-10 09:48:17 +0000 +++ src/ChangeLog 2014-02-10 22:15:54 +0000 @@ -1,3 +1,13 @@ +2014-02-10 Paul Eggert + + Avoid "." at end of error diagnostics. + * cmds.c (Fself_insert_command): Reword and avoid "." at end. + * font.c (Ffont_at): + * nsfns.m (ns_display_info_for_name): + * nsselect.m (Fx_own_selection_internal): + * nsterm.m (performDragOperation:): + Remove "." from end of diagnostic. + 2014-02-10 Lars Ingebrigtsen * fns.c (Fmaphash): Say what `maphash' returns, since it may be === modified file 'src/cmds.c' --- src/cmds.c 2014-02-10 05:41:42 +0000 +++ src/cmds.c 2014-02-10 22:15:54 +0000 @@ -280,8 +280,7 @@ CHECK_NUMBER (n); if (XFASTINT (n) < 1) - error ("Repetition argument is %"pI"d, but must be higher than 0.", - XFASTINT (n)); + error ("Nonpositive repetition argument %"pI"d", XFASTINT (n)); if (!EQ (Vthis_command, KVAR (current_kboard, Vlast_command))) nonundocount = 0; === modified file 'src/font.c' --- src/font.c 2014-01-10 07:10:37 +0000 +++ src/font.c 2014-02-10 22:15:54 +0000 @@ -4785,7 +4785,7 @@ if (NILP (string)) { if (XBUFFER (w->contents) != current_buffer) - error ("Specified window is not displaying the current buffer."); + error ("Specified window is not displaying the current buffer"); CHECK_NUMBER_COERCE_MARKER (position); if (! (BEGV <= XINT (position) && XINT (position) < ZV)) args_out_of_range_3 (position, make_number (BEGV), make_number (ZV)); === modified file 'src/nsfns.m' --- src/nsfns.m 2014-01-01 07:43:34 +0000 +++ src/nsfns.m 2014-02-10 22:15:54 +0000 @@ -183,7 +183,7 @@ if (!NILP (Fstring_equal (XCAR (dpyinfo->name_list_element), name))) return dpyinfo; - error ("Emacs for OpenStep does not yet support multi-display."); + error ("Emacs for OpenStep does not yet support multi-display"); Fx_open_connection (name, Qnil, Qnil); dpyinfo = x_display_list; === modified file 'src/nsselect.m' --- src/nsselect.m 2014-01-01 07:43:34 +0000 +++ src/nsselect.m 2014-02-10 22:15:54 +0000 @@ -351,7 +351,7 @@ check_window_system (NULL); CHECK_SYMBOL (selection); if (NILP (value)) - error ("selection value may not be nil."); + error ("Selection value may not be nil"); pb = ns_symbol_to_pb (selection); if (pb == nil) return Qnil; === modified file 'src/nsterm.m' --- src/nsterm.m 2014-02-07 03:25:52 +0000 +++ src/nsterm.m 2014-02-10 22:15:54 +0000 @@ -6786,7 +6786,7 @@ } else { - error ("Invalid data type in dragging pasteboard."); + error ("Invalid data type in dragging pasteboard"); return NO; } } ------------------------------------------------------------ revno: 116403 fixes bug: http://debbugs.gnu.org/14394 committer: Glenn Morris branch nick: trunk timestamp: Mon 2014-02-10 16:43:01 -0500 message: * lisp/jit-lock.el (jit-lock-force-redisplay): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-10 17:05:52 +0000 +++ lisp/ChangeLog 2014-02-10 21:43:01 +0000 @@ -1,3 +1,7 @@ +2014-02-10 Glenn Morris + + * jit-lock.el (jit-lock-force-redisplay): Doc fix. (Bug#14394) + 2014-02-10 Eli Zaretskii * w32-common-fns.el (x-get-selection): Doc fix. === modified file 'lisp/jit-lock.el' --- lisp/jit-lock.el 2014-01-01 07:43:34 +0000 +++ lisp/jit-lock.el 2014-02-10 21:43:01 +0000 @@ -419,7 +419,8 @@ (setq start (text-property-any next end 'fontified nil)))))))) (defun jit-lock-force-redisplay (start end) - "Force the display engine to re-render buffer BUF from START to END." + "Force the display engine to re-render START's buffer from START to END. +This applies to the buffer associated with marker START." (when (marker-buffer start) (with-current-buffer (marker-buffer start) (with-buffer-prepared-for-jit-lock ------------------------------------------------------------ revno: 116402 fixes bug: http://debbugs.gnu.org/15109 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2014-02-10 19:05:52 +0200 message: Fix bug #15109 with confusing mis-documentation of selection-converter-alist. lisp/w32-common-fns.el (x-get-selection): Doc fix. lisp/select.el (x-get-selection): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-10 16:08:37 +0000 +++ lisp/ChangeLog 2014-02-10 17:05:52 +0000 @@ -1,5 +1,8 @@ 2014-02-10 Eli Zaretskii + * w32-common-fns.el (x-get-selection): Doc fix. + * select.el (x-get-selection): Doc fix. (Bug#15109) + * face-remap.el (face-remap-add-relative) (face-remap-remove-relative, face-remap-reset-base) (face-remap-set-base): Call force-mode-line-update to redisplay === modified file 'lisp/select.el' --- lisp/select.el 2014-02-10 01:34:22 +0000 +++ lisp/select.el 2014-02-10 17:05:52 +0000 @@ -89,7 +89,8 @@ `PRIMARY', are `SECONDARY' and `CLIPBOARD'. DATA-TYPE is usually `STRING', but can also be one of the symbols -in `selection-converter-alist', which see." +in `selection-converter-alist', which see. This argument is +ignored on MS-Windows and MS-DOS." (let ((data (x-get-selection-internal (or type 'PRIMARY) (or data-type 'STRING))) coding) === modified file 'lisp/w32-common-fns.el' --- lisp/w32-common-fns.el 2014-01-01 07:43:34 +0000 +++ lisp/w32-common-fns.el 2014-02-10 17:05:52 +0000 @@ -79,7 +79,8 @@ `PRIMARY', are `SECONDARY' and `CLIPBOARD'. DATA-TYPE is usually `STRING', but can also be one of the symbols -in `selection-converter-alist', which see." +in `selection-converter-alist', which see. This argument is +ignored on MS-Windows and MS-DOS." (get 'x-selections (or type 'PRIMARY))) ;; x-selection-owner-p is used in simple.el ------------------------------------------------------------ revno: 116401 fixes bug: http://debbugs.gnu.org/16709 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2014-02-10 18:08:37 +0200 message: Fix bug #16709 with too lazy redisplay when face-remap-alist changes. lisp/face-remap.el (face-remap-add-relative) (face-remap-remove-relative, face-remap-reset-base) (face-remap-set-base): Call force-mode-line-update to redisplay the current buffer due to potential change in faces. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-10 13:54:33 +0000 +++ lisp/ChangeLog 2014-02-10 16:08:37 +0000 @@ -1,3 +1,10 @@ +2014-02-10 Eli Zaretskii + + * face-remap.el (face-remap-add-relative) + (face-remap-remove-relative, face-remap-reset-base) + (face-remap-set-base): Call force-mode-line-update to redisplay + the current buffer due to potential change in faces. (Bug#16709) + 2014-02-10 Michael Albinus * net/tramp-sh.el (tramp-sh-handle-vc-registered): Apply heredoc === modified file 'lisp/face-remap.el' --- lisp/face-remap.el 2014-01-01 07:43:34 +0000 +++ lisp/face-remap.el 2014-02-10 16:08:37 +0000 @@ -135,7 +135,9 @@ (let ((faces (cdr entry))) (if (symbolp faces) (setq faces (list faces))) - (setcdr entry (face-remap-order (cons specs faces)))) + (setcdr entry (face-remap-order (cons specs faces))) + ;; Force redisplay of this buffer. + (force-mode-line-update)) (cons face specs))) (defun face-remap-remove-relative (cookie) @@ -150,7 +152,9 @@ (and (eq (car-safe updated-entries) (car cookie)) (null (cdr updated-entries)))) (setq face-remapping-alist - (remq remapping face-remapping-alist))) + (remq remapping face-remapping-alist)) + ;; Force redisplay of this buffer. + (force-mode-line-update)) (cdr cookie)))))) ;;;###autoload @@ -167,7 +171,9 @@ (if (null (cddr entry)) ; nothing except base remapping (setq face-remapping-alist ; so remove entire entry (remq entry face-remapping-alist)) - (setcar (last entry) face))))) ; otherwise, just inherit global def + (setcar (last entry) face)) + ;; Force redisplay of this buffer. + (force-mode-line-update)))) ; otherwise, just inherit global def ;;;###autoload (defun face-remap-set-base (face &rest specs) @@ -194,7 +200,9 @@ (let ((entry (assq face face-remapping-alist))) (if entry (setcar (last entry) specs) ; overwrite existing base entry - (push (list face specs) face-remapping-alist))))) + (push (list face specs) face-remapping-alist))) + ;; Force redisplay of this buffer. + (force-mode-line-update))) ;; ---------------------------------------------------------------- ------------------------------------------------------------ revno: 116400 committer: Michael Albinus branch nick: trunk timestamp: Mon 2014-02-10 14:54:33 +0100 message: * net/tramp-sh.el (tramp-sh-handle-vc-registered): Apply heredoc script more robustly. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-10 13:22:14 +0000 +++ lisp/ChangeLog 2014-02-10 13:54:33 +0000 @@ -1,3 +1,8 @@ +2014-02-10 Michael Albinus + + * net/tramp-sh.el (tramp-sh-handle-vc-registered): Apply heredoc + script more robustly. + 2014-02-10 Lars Ingebrigtsen * dired.el (dired-get-marked-files): Doc fix (bug#11534). === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2014-02-10 13:22:14 +0000 +++ lisp/net/tramp-sh.el 2014-02-10 13:54:33 +0000 @@ -3308,15 +3308,24 @@ (dolist (elt - (tramp-send-command-and-read - v - (format - "tramp_vc_registered_read_file_names <<'%s'\n%s\n%s\n" - tramp-end-of-heredoc - (mapconcat 'tramp-shell-quote-argument - tramp-vc-registered-file-names - "\n") - tramp-end-of-heredoc))) + (ignore-errors + ;; We cannot use `tramp-send-command-and-read', + ;; because this does not cooperate well with + ;; heredoc documents. + (tramp-send-command + v + (format + "tramp_vc_registered_read_file_names <<'%s'\n%s\n%s\n" + tramp-end-of-heredoc + (mapconcat 'tramp-shell-quote-argument + tramp-vc-registered-file-names + "\n") + tramp-end-of-heredoc)) + (tramp-send-command-and-check v nil) + (with-current-buffer (tramp-get-connection-buffer v) + ;; Read the expression. + (goto-char (point-min)) + (read (current-buffer))))) (tramp-set-file-property v (car elt) (cadr elt) (cadr (cdr elt)))))) ------------------------------------------------------------ revno: 116399 committer: Michael Albinus branch nick: trunk timestamp: Mon 2014-02-10 14:22:14 +0100 message: Revert previous patch, it introduces other problems. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-10 10:06:07 +0000 +++ lisp/ChangeLog 2014-02-10 13:22:14 +0000 @@ -1,8 +1,3 @@ -2014-02-10 Michael Albinus - - * net/tramp-sh.el (tramp-sh-handle-start-file-process): Do not - quote `tramp-end-of-heredoc'. - 2014-02-10 Lars Ingebrigtsen * dired.el (dired-get-marked-files): Doc fix (bug#11534). === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2014-02-10 10:06:07 +0000 +++ lisp/net/tramp-sh.el 2014-02-10 13:22:14 +0000 @@ -2713,7 +2713,7 @@ (when (stringp program) (format "cd %s && exec %s env PS1=%s %s" (tramp-shell-quote-argument localname) - (if heredoc (format "<<%s" tramp-end-of-heredoc) "") + (if heredoc (format "<<'%s'" tramp-end-of-heredoc) "") ;; Use a human-friendly prompt, for example for `shell'. (tramp-shell-quote-argument (format "%s %s" ------------------------------------------------------------ revno: 116398 committer: Glenn Morris branch nick: trunk timestamp: Mon 2014-02-10 06:21:38 -0500 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/dired.el' --- lisp/dired.el 2014-02-10 07:13:14 +0000 +++ lisp/dired.el 2014-02-10 11:21:38 +0000 @@ -3859,7 +3859,7 @@ ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "dired-aux" "dired-aux.el" "332d4c099a8b7d64df3fa7176a6e2a61") +;;;### (autoloads nil "dired-aux" "dired-aux.el" "bd357e0a0e74eb553e90e0b6d19cf611") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2014-02-10 01:34:22 +0000 +++ lisp/mail/rmail.el 2014-02-10 11:21:38 +0000 @@ -4624,7 +4624,7 @@ ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "rmailedit" "rmailedit.el" "dd2c1220747ca044a4d9b7ca6dc1843f") +;;;### (autoloads nil "rmailedit" "rmailedit.el" "b155463a02e4aa9256ac21997ea003e9") ;;; Generated autoloads from rmailedit.el (autoload 'rmail-edit-current-message "rmailedit" "\ @@ -4634,7 +4634,7 @@ ;;;*** -;;;### (autoloads nil "rmailkwd" "rmailkwd.el" "b704fe915e8fe42e5d655096ed2fa21f") +;;;### (autoloads nil "rmailkwd" "rmailkwd.el" "d462d15a119ee2a1733de2bc31bf347c") ;;; Generated autoloads from rmailkwd.el (autoload 'rmail-add-label "rmailkwd" "\ @@ -4677,7 +4677,7 @@ ;;;*** -;;;### (autoloads nil "rmailmm" "rmailmm.el" "14706c880a031839d767ee7edaeef97e") +;;;### (autoloads nil "rmailmm" "rmailmm.el" "4904dafb4e3b7b456c14e63d2dc9163d") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ @@ -4703,7 +4703,7 @@ ;;;*** -;;;### (autoloads nil "rmailmsc" "rmailmsc.el" "342dc295a4574ea68fc29a7303b01876") +;;;### (autoloads nil "rmailmsc" "rmailmsc.el" "0950b0ad020610737220948bb3f37c17") ;;; Generated autoloads from rmailmsc.el (autoload 'set-rmail-inbox-list "rmailmsc" "\ @@ -4717,7 +4717,7 @@ ;;;*** -;;;### (autoloads nil "rmailsort" "rmailsort.el" "e9f48c399319c56542c88446b2ccf1dc") +;;;### (autoloads nil "rmailsort" "rmailsort.el" "4106a6e4898795822554ce931f531ab8") ;;; Generated autoloads from rmailsort.el (autoload 'rmail-sort-by-date "rmailsort" "\ @@ -4774,7 +4774,7 @@ ;;;*** -;;;### (autoloads nil "rmailsum" "rmailsum.el" "56fe07cc46b6146b51506b3e4c27e49f") +;;;### (autoloads nil "rmailsum" "rmailsum.el" "9baf491e4facec07debcb6aa55a11b54") ;;; Generated autoloads from rmailsum.el (autoload 'rmail-summary "rmailsum" "\ @@ -4821,7 +4821,7 @@ ;;;*** -;;;### (autoloads nil "undigest" "undigest.el" "763e782c6c8cfa744acfcce990689162") +;;;### (autoloads nil "undigest" "undigest.el" "f30d93eb6a006ac64080a1ee8a45a1af") ;;; Generated autoloads from undigest.el (autoload 'undigestify-rmail-message "undigest" "\ ------------------------------------------------------------ revno: 116397 committer: Michael Albinus branch nick: trunk timestamp: Mon 2014-02-10 11:06:07 +0100 message: * net/tramp-sh.el (tramp-sh-handle-start-file-process): Do not quote `tramp-end-of-heredoc'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-10 07:13:14 +0000 +++ lisp/ChangeLog 2014-02-10 10:06:07 +0000 @@ -1,3 +1,8 @@ +2014-02-10 Michael Albinus + + * net/tramp-sh.el (tramp-sh-handle-start-file-process): Do not + quote `tramp-end-of-heredoc'. + 2014-02-10 Lars Ingebrigtsen * dired.el (dired-get-marked-files): Doc fix (bug#11534). === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2014-02-08 13:35:15 +0000 +++ lisp/net/tramp-sh.el 2014-02-10 10:06:07 +0000 @@ -2713,7 +2713,7 @@ (when (stringp program) (format "cd %s && exec %s env PS1=%s %s" (tramp-shell-quote-argument localname) - (if heredoc (format "<<'%s'" tramp-end-of-heredoc) "") + (if heredoc (format "<<%s" tramp-end-of-heredoc) "") ;; Use a human-friendly prompt, for example for `shell'. (tramp-shell-quote-argument (format "%s %s" ------------------------------------------------------------ revno: 116396 committer: Dmitry Antipov branch nick: trunk timestamp: Mon 2014-02-10 13:48:17 +0400 message: * eval.c (call_debugger): When exiting the debugger, do not allow max_specpdl_size less than actual binding depth (Bug#16603). (syms_of_eval): Adjust docstring. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-02-10 06:04:39 +0000 +++ src/ChangeLog 2014-02-10 09:48:17 +0000 @@ -8,6 +8,9 @@ * cmds.c (Fself_insert_command): Respect the width of EMACS_INT and avoid warning. + * eval.c (call_debugger): When exiting the debugger, do not allow + max_specpdl_size less than actual binding depth (Bug#16603). + (syms_of_eval): Adjust docstring. 2014-02-09 Lars Ingebrigtsen === modified file 'src/eval.c' --- src/eval.c 2014-02-03 09:37:43 +0000 +++ src/eval.c 2014-02-10 09:48:17 +0000 @@ -283,7 +283,9 @@ bool debug_while_redisplaying; ptrdiff_t count = SPECPDL_INDEX (); Lisp_Object val; - EMACS_INT old_max = max_specpdl_size, old_depth = max_lisp_eval_depth; + EMACS_INT old_depth = max_lisp_eval_depth; + /* Do not allow max_specpdl_size less than actual depth (Bug#16603). */ + EMACS_INT old_max = max (max_specpdl_size, count); if (lisp_eval_depth + 40 > max_lisp_eval_depth) max_lisp_eval_depth = lisp_eval_depth + 40; @@ -3721,7 +3723,9 @@ an error is signaled. You can safely use a value considerably larger than the default value, if that proves inconveniently small. However, if you increase it too far, -Emacs could run out of memory trying to make the stack bigger. */); +Emacs could run out of memory trying to make the stack bigger. +Note that this limit may be silently increased by the debugger +if `debug-on-error' or `debug-on-quit' is set. */); DEFVAR_INT ("max-lisp-eval-depth", max_lisp_eval_depth, doc: /* Limit on depth in `eval', `apply' and `funcall' before error. ------------------------------------------------------------ revno: 116395 committer: Glenn Morris branch nick: trunk timestamp: Mon 2014-02-10 00:36:27 -0800 message: * lisp/emacs-lisp/lisp-mnt.el: Comments. diff: === modified file 'lisp/emacs-lisp/lisp-mnt.el' --- lisp/emacs-lisp/lisp-mnt.el 2014-02-10 01:37:11 +0000 +++ lisp/emacs-lisp/lisp-mnt.el 2014-02-10 08:36:27 +0000 @@ -85,10 +85,9 @@ ;; at a different version of the file than the one they're accustomed to. This ;; may be an RCS or SCCS header. ;; -;; * Adapted-By line --- this is for FSF's internal use. The person named -;; in this field was the one responsible for installing and adapting the -;; package for the distribution. (This file doesn't have one because the -;; author *is* one of the maintainers.) +;; * Adapted-By line --- this was used historically when some files +;; were added to Emacs. The person named in this field installed and +;; (possibly adapted) the package in the Emacs distribution. ;; ;; * Keywords line --- used by the finder code for finding Emacs ;; Lisp code related to a topic.