------------------------------------------------------------ revno: 116715 fixes bug: http://debbugs.gnu.org/16920 committer: Leo Liu branch nick: trunk timestamp: Mon 2014-03-10 13:33:31 +0800 message: * emacs-lisp/eldoc.el (eldoc-minibuffer-message): Clear eldoc-last-message. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-10 02:18:29 +0000 +++ lisp/ChangeLog 2014-03-10 05:33:31 +0000 @@ -1,3 +1,8 @@ +2014-03-10 Leo Liu + + * emacs-lisp/eldoc.el (eldoc-minibuffer-message): Clear + eldoc-last-message. (Bug#16920) + 2014-03-10 Stefan Monnier * desktop.el (desktop-create-buffer): Don't run activate-mark-hook === modified file 'lisp/emacs-lisp/eldoc.el' --- lisp/emacs-lisp/eldoc.el 2014-01-30 07:54:28 +0000 +++ lisp/emacs-lisp/eldoc.el 2014-03-10 05:33:31 +0000 @@ -219,7 +219,9 @@ (if (minibufferp) (progn (add-hook 'minibuffer-exit-hook - (lambda () (setq eldoc-mode-line-string nil)) + (lambda () (setq eldoc-mode-line-string nil + ;; http://debbugs.gnu.org/16920 + eldoc-last-message nil)) nil t) (with-current-buffer (window-buffer ------------------------------------------------------------ revno: 116714 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14430 committer: Stefan Monnier branch nick: trunk timestamp: Sun 2014-03-09 22:18:29 -0400 message: * lisp/desktop.el (desktop-create-buffer): Don't run activate-mark-hook. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-09 23:55:11 +0000 +++ lisp/ChangeLog 2014-03-10 02:18:29 +0000 @@ -1,3 +1,8 @@ +2014-03-10 Stefan Monnier + + * desktop.el (desktop-create-buffer): Don't run activate-mark-hook + (bug#14430). + 2014-03-09 Juri Linkov * ansi-color.el (ansi-color-names-vector): Copy default colors === modified file 'lisp/desktop.el' --- lisp/desktop.el 2014-02-22 02:10:49 +0000 +++ lisp/desktop.el 2014-03-10 02:18:29 +0000 @@ -491,13 +491,13 @@ Furthermore, they may use the following variables: - desktop-file-version - desktop-buffer-major-mode - desktop-buffer-minor-modes - desktop-buffer-point - desktop-buffer-mark - desktop-buffer-read-only - desktop-buffer-locals + `desktop-file-version' + `desktop-buffer-major-mode' + `desktop-buffer-minor-modes' + `desktop-buffer-point' + `desktop-buffer-mark' + `desktop-buffer-read-only' + `desktop-buffer-locals' If a handler returns a buffer, then the saved mode settings and variable values for that buffer are copied into it. @@ -551,15 +551,15 @@ Furthermore, they may use the following variables: - desktop-file-version - desktop-buffer-file-name - desktop-buffer-name - desktop-buffer-major-mode - desktop-buffer-minor-modes - desktop-buffer-point - desktop-buffer-mark - desktop-buffer-read-only - desktop-buffer-misc + `desktop-file-version' + `desktop-buffer-file-name' + `desktop-buffer-name' + `desktop-buffer-major-mode' + `desktop-buffer-minor-modes' + `desktop-buffer-point' + `desktop-buffer-mark' + `desktop-buffer-read-only' + `desktop-buffer-misc' When a handler is called, the buffer has been created and the major mode has been set, but local variables listed in desktop-buffer-locals has not yet been @@ -1380,20 +1380,21 @@ (eval desktop-buffer-point) (error (message "%s" (error-message-string err)) 1)))) (when desktop-buffer-mark - (if (consp desktop-buffer-mark) - (progn - (set-mark (car desktop-buffer-mark)) - (setq mark-active (car (cdr desktop-buffer-mark)))) - (set-mark desktop-buffer-mark))) + (if (consp desktop-buffer-mark) + (progn + (move-marker (mark-marker) (car desktop-buffer-mark)) + ;; FIXME: Should we call (de)activate-mark instead? + (setq mark-active (car (cdr desktop-buffer-mark)))) + (move-marker (mark-marker) desktop-buffer-mark))) ;; Never override file system if the file really is read-only marked. (when desktop-buffer-read-only (setq buffer-read-only desktop-buffer-read-only)) (dolist (this desktop-buffer-locals) (if (consp this) - ;; an entry of this form `(symbol . value)' + ;; An entry of this form `(symbol . value)'. (progn (make-local-variable (car this)) (set (car this) (cdr this))) - ;; an entry of the form `symbol' + ;; An entry of the form `symbol'. (make-local-variable this) (makunbound this)))))))) ------------------------------------------------------------ revno: 116713 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2014-03-10 01:09:30 +0100 message: lib-src/emacsclient.c (main): #ifdef out previous change on Windows. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2014-03-09 22:38:15 +0000 +++ lib-src/ChangeLog 2014-03-10 00:09:30 +0000 @@ -1,3 +1,7 @@ +2014-03-10 Juanma Barranquero + + * emacsclient.c (main): #ifdef out previous change on Windows. + 2014-03-09 Paul Eggert Fix emacsclient terminal corruption when in background (Bug#16892). === modified file 'lib-src/emacsclient.c' --- lib-src/emacsclient.c 2014-03-09 22:38:15 +0000 +++ lib-src/emacsclient.c 2014-03-10 00:09:30 +0000 @@ -1556,6 +1556,7 @@ exit (EXIT_FAILURE); } +#ifndef WINDOWSNT if (tty) { pid_t pgrp = getpgrp (); @@ -1563,6 +1564,7 @@ if (0 <= tcpgrp && tcpgrp != pgrp) kill (-pgrp, SIGTTIN); } +#endif /* !WINDOWSNT */ /* If alternate_editor is the empty string, start the emacs daemon in case of failure to connect. */ ------------------------------------------------------------ revno: 116712 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2014-03-10 00:55:11 +0100 message: etc/ChangeLog: Add missing bug reference. doc/emacs/ChangeLog, doc/lispref/ChangeLog, lisp/ChangeLog*: Fix typos. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-03-03 04:57:26 +0000 +++ doc/emacs/ChangeLog 2014-03-09 23:55:11 +0000 @@ -454,8 +454,8 @@ (emacs.ps, emacs-xtra.ps): Remove explicit rules. (emacs.html): Use HTML_OPTS. (clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS. - (.PHONY): install-dvi, install-html, install-pdf, install-ps - ,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf, + (.PHONY): install-dvi, install-html, install-pdf, install-ps, + install-doc, uninstall-dvi, uninstall-html, uninstall-pdf, uninstall-ps, and uninstall-doc. (install-dvi, install-html, install-pdf, install-ps, install-doc) (uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf) === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-03-09 11:36:51 +0000 +++ doc/lispref/ChangeLog 2014-03-09 23:55:11 +0000 @@ -3720,7 +3720,7 @@ 2011-07-16 Lars Magne Ingebrigtsen Tim Cross (tiny change) - Glenn Morris + Glenn Morris * keymaps.texi (Toolkit Differences): New node. (Bug#8176) === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-03-08 20:12:42 +0000 +++ etc/ChangeLog 2014-03-09 23:55:11 +0000 @@ -1,6 +1,6 @@ 2014-03-08 Luis Felipe López Acevedo (tiny change) - * tutorials/TUTORIAL.es: Fix typos. + * tutorials/TUTORIAL.es: Fix typos. (Bug#116707) 2014-03-08 Eli Zaretskii === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-09 21:55:35 +0000 +++ lisp/ChangeLog 2014-03-09 23:55:11 +0000 @@ -3,7 +3,7 @@ * ansi-color.el (ansi-color-names-vector): Copy default colors from `xterm-standard-colors' that look well on the default white background (and also on the black background) to avoid illegible - color combinations like yello-on-white and white-on-white. + color combinations like yellow-on-white and white-on-white. http://lists.gnu.org/archive/html/emacs-devel/2014-02/msg00157.html 2014-03-08 Juanma Barranquero === modified file 'lisp/ChangeLog.10' --- lisp/ChangeLog.10 2014-01-26 00:47:40 +0000 +++ lisp/ChangeLog.10 2014-03-09 23:55:11 +0000 @@ -1729,7 +1729,7 @@ (bibtex-pop): Simplify. (bibtex-mode): Move setting of bibtex-string to bibtex-parse-strings. Set choose-completion-string-functions. - (bibtex-print-help-message,bibtex-make-field, bibtex-end-of-entry) + (bibtex-print-help-message, bibtex-make-field, bibtex-end-of-entry) (bibtex-count-entries): Simplify. (bibtex-entry-index, bibtex-lessp): New funs for generalized sorting scheme of indices, see bibtex-maintain-sorted-entries. @@ -2564,9 +2564,9 @@ * ediff-util.el (ediff-maybe-save-and-delete-merge): Change in a message. - * ediff.el (ediff-directories,ediff-directory-revisions) - (ediff-directories3,ediff-merge-directories) - (ediff-merge-directories-with-ancestor,ediff-merge-directory-revisions) + * ediff.el (ediff-directories, ediff-directory-revisions) + (ediff-directories3, ediff-merge-directories) + (ediff-merge-directories-with-ancestor, ediff-merge-directory-revisions) (ediff-merge-directory-revisions-with-ancestor): Make use of the new ediff-default-filtering-regexp variable. @@ -8035,7 +8035,7 @@ scroll event where a click on the mouse wheel button is ignored. (mouse-wheel-click-event, mouse-wheel-inhibit-click-time): New customs. (mouse-wheel-click-button, mwheel-inhibit-click-event-timer): New vars. - (mwheel-inhibit-click-timeout,mwheel-filter-click-events): New defuns. + (mwheel-inhibit-click-timeout, mwheel-filter-click-events): New defuns. (mwheel-scroll): Add mwheel-filter-click-events as pre-command-hook. Start mwheel-inhibit-click-event-timer with timeout handler mwheel-inhibit-click-timeout. @@ -13751,8 +13751,8 @@ (cvs-addto-collection): Use it to preserve point. (cvs-vc-command-advice): Ad-hoc workaround for `cvs -q add'. - * mwheel.el (mouse-wheel-scroll-amount,mwheel-scroll,mouse-wheel-mode): - Don't require the first element to be modifier-free. + * mwheel.el (mouse-wheel-scroll-amount, mwheel-scroll) + (mouse-wheel-mode): Don't require the first element to be modifier-free. * pcvs-parse.el (cvs-parse-table): Handle `nothing known about' with more care. @@ -17879,8 +17879,8 @@ * ediff-diff.el (ediff-install-fine-diff-if-necessary): Take the current highlighting style into account. - (ediff-forward-word-function,ediff-whitespace,ediff-word-1) - (ediff-word-2,ediff-word-3,ediff-word-4): Make them buffer local. + (ediff-forward-word-function, ediff-whitespace, ediff-word-1) + (ediff-word-2, ediff-word-3, ediff-word-4): Make them buffer local. * ediff-init.el (ediff-patch-job): New macro. @@ -18358,7 +18358,7 @@ is loaded. * ediff-mult.el (ediff-intersect-directories) - (ediff-prepare-meta-buffer,ediff-get-directory-files-under-revision): + (ediff-prepare-meta-buffer, ediff-get-directory-files-under-revision): Cleanup. (ediff-draw-dir-diffs): Now supports the "C" command in directory difference buffer. @@ -23163,7 +23163,7 @@ * textmodes/texnfo-upd.el: Use `when', `dolist', `push', ... (texinfo-update-node, texinfo-sequential-node-update): Don't bind the obsolete `auto-fill-hook'. - (texinfo-multi-file-included-list,texinfo-multi-file-master-menu-list): + (texinfo-multi-file-included-list, texinfo-multi-file-master-menu-list): Use `set-buffer' rather than `switch-to-buffer'. (texinfo-multi-file-update): Use "Top" rather than `up-node-name'. Use `set-buffer' rather than `switch-to-buffer'. === modified file 'lisp/ChangeLog.11' --- lisp/ChangeLog.11 2014-01-26 00:47:40 +0000 +++ lisp/ChangeLog.11 2014-03-09 23:55:11 +0000 @@ -2483,7 +2483,7 @@ string to kill-ring. * calc/calc-aent.el (calc-alg-exp, math-toks) - (math-exp-pos,math-exp-old-pos, math-exp-token) + (math-exp-pos, math-exp-old-pos, math-exp-token) (math-exp-keep-spaces, math-exp-str): New variables. (calc-do-alg-entry, calcAlg-equals, calcAlg-edit) (calcAlg-enter): Use declared variable calc-alg-exp. @@ -3287,7 +3287,7 @@ 2004-10-26 Jay Belanger - * calc/calc.el (calc,full-calc, calc-quit, calc-keypad) + * calc/calc.el (calc, full-calc, calc-quit, calc-keypad) (full-calc-keypad, calc-trail-display): Use an extra argument instead of `interactive-p'. @@ -5099,7 +5099,7 @@ (isearch-*-char, isearch-|-char): Now just call `isearch-fallback' appropriately. (isearch-mode-map): Bind `}' to `isearch-}-char'. - (isearch-string, isearch-message,string, isearch-point) + (isearch-string, isearch-message-string, isearch-point) (isearch-success, isearch-forward-flag, isearch-other-end) (isearch-word, isearch-invalid-regexp, isearch-wrapped) (isearch-barrier, isearch-within-brackets, isearch-case-fold-search): @@ -11315,7 +11315,7 @@ * emacs-lisp/shadow.el (shadow-same-file-or-nonexistent): * man.el (Man-init-defvars): * jka-compr.el (jka-compr-call-process): - * files.el (get-free-disk-space,insert-directory): + * files.el (get-free-disk-space, insert-directory): * ediff-ptch.el (ediff-test-patch-utility): * ediff-diff.el (ediff-test-utility): * dired-aux.el (dired-check-process): @@ -11830,7 +11830,7 @@ 2003-11-25 Stephen Eglen - * iswitchb.el (iswitchb-read-buffer,iswitchb-exit-minibuffer): + * iswitchb.el (iswitchb-read-buffer, iswitchb-exit-minibuffer): iswitchb-exit is set to 'usefirst when user selects buffer at head of list using RET. (Selecting buffers at the head of the list was broken if the substring was also a complete buffer name.) @@ -12385,8 +12385,8 @@ (ediff-select-difference): Set current difference. (ediff-unselect-and-select-difference): Add comment. - * ediff.el (ediff-directories,ediff-directory-revisions) - (ediff-directories3,ediff-merge-directories) + * ediff.el (ediff-directories, ediff-directory-revisions) + (ediff-directories3, ediff-merge-directories) (ediff-merge-directories-with-ancestor) (ediff-merge-directory-revisions) (ediff-merge-directory-revisions-with-ancestor): @@ -12518,7 +12518,7 @@ * gdb-ui.el (gdb-var-list, gdb-var-changed, gdb-update-flag) (gdb-update-flag): New variables. - (gdb-var-update, gdb-var-update-handler,gdb-var-delete) + (gdb-var-update, gdb-var-update-handler, gdb-var-delete) (gdb-speedbar-expand-node, gdb-var-evaluate-expression-handler) (gud-watch, gdb-var-create-handler): New functions. (gdb-var-list-children, gdb-var-list-children-handler) @@ -12537,9 +12537,9 @@ (gdb-array-size, gdb-display-mode-map, gdb-expressions-mode-map): (gdb-expressions-mode-menu, gdb-dive): Remove variables. (gud-display, gud-display1) - (gdb-display-begin,gdb-display-number-end, gdb-delete-line) + (gdb-display-begin, gdb-display-number-end, gdb-delete-line) (gdb-display-end, gdb-display-go-back, gdb-array-section-end) - (gdb-field-begin, gdb-field-end, gdb-elt,gdb-field-format-begin) + (gdb-field-begin, gdb-field-end, gdb-elt, gdb-field-format-begin) (gdb-field-format-end, gdb-dive, gdb-dive-new-frame) (gdb-insert-field, gdb-array-format, gdb-mouse-array-slice) (gdb-array-slice, gdb-array-format1, gdb-info-display-custom) @@ -12935,7 +12935,7 @@ 2003-09-08 David Ponce Ensure that recentf correctly updates the menu bar. - * recentf.el (recentf-menu-path,recentf-menu-before): Doc fix. + * recentf.el (recentf-menu-path, recentf-menu-before): Doc fix. (recentf-menu-bar): New function. (recentf-clear-data): Use it. (recentf-update-menu): Likewise. Use easy-menu-add-item instead @@ -12966,7 +12966,7 @@ * gdb-ui.el (gud-display1): Use gud-call to prevent extra prompt being displayed in GUD buffer. (gdb-idle-input-queue): Remove var. Use just one queue. - (gdb-enqueue-idle-input,gdb-dequeue-idle-input): + (gdb-enqueue-idle-input, gdb-dequeue-idle-input): Remove functions. Use just one queue. (gdb-prompt, gdb-subprompt, def-gdb-auto-update-trigger) (gdb-invalidate-assembler, gdb-get-current-frame): === modified file 'lisp/ChangeLog.8' --- lisp/ChangeLog.8 2014-01-18 01:27:51 +0000 +++ lisp/ChangeLog.8 2014-03-09 23:55:11 +0000 @@ -51,8 +51,8 @@ * progmodes/hideshow.el (hs-minor-mode-menu): Fix omission bug; was used but not declared. - (hs-discard-overlays, hs-isearch-show, hs-isearch-show-temporary, - hs-find-block-beginning): Add or modify docstrings. + (hs-discard-overlays, hs-isearch-show, hs-isearch-show-temporary) + (hs-find-block-beginning): Add or modify docstrings. (hs-isearch-show): Rewrite. @@ -307,8 +307,8 @@ * font-lock.el (c-keywords): Only highlight preprocessor directives when spelled correctly. - * font-lock.el (font-lock-match-c++-structor-declaration, - c++-keywords): Fontify constructors and destructors with function + * font-lock.el (font-lock-match-c++-structor-declaration) + (c++-keywords): Fontify constructors and destructors with function face inside C++ class declarations. 1999-12-16 Gerd Moellmann @@ -444,8 +444,8 @@ ps-mule-cmpchar-prologue-generated. (ps-mule-composition-prologue): New named from ps-mule-cmpchar-prologue. Modified for new composition. - (ps-mule-plot-rule-cmpchar, ps-mule-plot-cmpchar, - ps-mule-prepare-cmpchar-font): Deleted. + (ps-mule-plot-rule-cmpchar, ps-mule-plot-cmpchar) + (ps-mule-prepare-cmpchar-font): Deleted. (ps-mule-string-encoding): New arg NO-SETFONT. (ps-mule-bitmap-prologue): In PostScript code of BuildGlyphCommon, check Composing, not Cmpchar. @@ -646,8 +646,8 @@ 1999-12-12 Martin Stjernholm - * cc-align.el (c-indent-multi-line-block, - c-lineup-whitesmith-in-block): Two new lineup functions for + * cc-align.el (c-indent-multi-line-block) + (c-lineup-whitesmith-in-block): Two new lineup functions for use in whitesmith style. * cc-styles.el (c-style-alist): More fixes to whitesmith @@ -857,8 +857,8 @@ beginning-of-defun/end-of-defun wrappers separated from c-point. - * cc-menus.el (imenu-generic-expression, - imenu-case-fold-search, imenu-progress-message): Dummy + * cc-menus.el (imenu-generic-expression) + (imenu-case-fold-search, imenu-progress-message): Dummy definitions to avoid compiler warnings if imenu can't be loaded. * cc-menus.el (cc-imenu-init): New function called at mode @@ -1019,10 +1019,10 @@ 1999-12-06 Michael Kifer - * viper-cmd.el (viper-minibuffer-standard-hook, - viper-minibuffer-real-start): Mew functions. - (viper-read-string-with-history,viper-file-add-suffix, - viper-trim-replace-chars-to-delete-if-necessary): Adapt to the + * viper-cmd.el (viper-minibuffer-standard-hook) + (viper-minibuffer-real-start): Mew functions. + (viper-read-string-with-history, viper-file-add-suffix) + (viper-trim-replace-chars-to-delete-if-necessary): Adapt to the change in the status of the minibuffer prompt. 1999-12-06 Gerd Moellmann @@ -1055,8 +1055,8 @@ for better approximation of X colors. (msdos-face-setup): Call tty-color-clear. Remove code that sets up tty-color-alist (it is now on startup.el). - (x-display-color-p, x-color-defined-p, x-color-values, - x-defined-colors, face-color-supported-p, face-color-gray-p): + (x-display-color-p, x-color-defined-p, x-color-values) + (x-defined-colors, face-color-supported-p, face-color-gray-p): Remove. * facemenu.el (facemenu-read-color, list-colors-display): Use @@ -1071,8 +1071,8 @@ of frames. (defined-colors, color-defined-p, color-values, display-color-p): New functions. - (x-defined-colors, x-color-defined-p, x-color-values, - x-display-color-p): Aliases for the above. + (x-defined-colors, x-color-defined-p, x-color-values) + (x-display-color-p): Aliases for the above. * startup.el (command-line): Register terminal colors for frame types other than x and w32, but only if the terminal supports @@ -1544,11 +1544,11 @@ 1999-11-15 Sam Steingold - * goto-addr.el (goto-address-at-mouse, - goto-address-find-address-at-point): Use compose-mail. + * goto-addr.el (goto-address-at-mouse) + (goto-address-find-address-at-point): Use compose-mail. (goto-address-mail-method): Removed variable. - (goto-address-send-using-mh-e, goto-address-send-using-mhe, - goto-address-send-using-mail): Removed functions. + (goto-address-send-using-mh-e, goto-address-send-using-mhe) + (goto-address-send-using-mail): Removed functions. 1998-11-15 Sam Steingold @@ -1797,7 +1797,7 @@ windows. (ediff-file-checked-in-p): Don't consider CVS files checked in. - (ediff-make-temp-file,ediff-make-empty-tmp-file): Make sure you + (ediff-make-temp-file, ediff-make-empty-tmp-file): Make sure you are writing to a newly created empty file. * ediff-mult.el (ediff-show-session-group-hook): New default. @@ -1818,13 +1818,13 @@ * viper-util.el (viper-nontrivial-find-file-function): Deleted. (viper-glob-unix-files, viper-glob-mswindows-files): New functions. - (viper-save-cursor-color,viper-restore-cursor-color): + (viper-save-cursor-color, viper-restore-cursor-color): Improved cursor color handling. (viper-get-saved-cursor-color-in-replace-mode) (viper-get-saved-cursor-color-in-insert-mode): New functions for better cursor color handling. - * viper-ex.el (ex-read,ex-edit): + * viper-ex.el (ex-read, ex-edit): Fixes for correct interpretation of #,%. (viper-ex): Now works correctly when called from other functions. (viper-glob-function): New variable. @@ -2655,7 +2655,7 @@ * textmodes/reftex-cite.el (reftex-pop-to-bibtex-entry): Fixed bug with recentering window. (reftex-extract-bib-entries-from-thebibliography) - (reftex-offer-bib-menu,reftex-bibtex-selection-callback): + (reftex-offer-bib-menu, reftex-bibtex-selection-callback): Deal with multiple thebibliography environments. * textmodes/reftex-vars.el (reftex-section-levels): @@ -2835,8 +2835,8 @@ Changes from Didier Verna: (custom-prompt-variable): Optional third arg makes prompt for a comment string. - (customize-set-value, customize-set-variable, - customize-save-variable): Optional prefix makes function handle + (customize-set-value, customize-set-variable) + (customize-save-variable): Optional prefix makes function handle variable comments. (customize-customized, customize-saved, custom-variable-state-set) (custom-variable-set, custom-variable-save, custom-face-state-set) @@ -3606,12 +3606,12 @@ thrown in gratuitously. (hanoi): Changed default number of rings back to 3. (hanoi-unix, hanoi-unix-64): New commands. - (hanoi-horizontal-flag, hanoi-move-period, hanoi-use-faces, - hanoi-pole-face, hanoi-base-face, hanoi-even-ring-face, - hanoi-odd-ring-face): New variables. - (hanoi-internal, hanoi-current-time-float, hanoi-put-face, - hanoi-n, hanoi-insert-ring, hanoi-goto-char, hanoi-sit-for, - hanoi-ring-to-pos, hanoi-pos-on-tower-p): New functions. + (hanoi-horizontal-flag, hanoi-move-period, hanoi-use-faces) + (hanoi-pole-face, hanoi-base-face, hanoi-even-ring-face) + (hanoi-odd-ring-face): New variables. + (hanoi-internal, hanoi-current-time-float, hanoi-put-face) + (hanoi-n, hanoi-insert-ring, hanoi-goto-char, hanoi-sit-for) + (hanoi-ring-to-pos, hanoi-pos-on-tower-p): New functions. (hanoi-0): Renamed from hanoi0, for symmetry with hanoi-n. (hanoi-topos, hanoi-draw-ring): Removed. @@ -3769,7 +3769,7 @@ * progmodes/ada-mode.el (ada-tmp-directory): Use temporary-file-directory. - * progmodes/compile.el (compilation-parsing-end,compilation-setup) + * progmodes/compile.el (compilation-parsing-end, compilation-setup) (compilation-filter, compilation-forget-errors) (compilation-parse-errors): Use a marker instead of an integer for `compilation-parsing-end'. @@ -6384,8 +6384,8 @@ * international/mule.el (coding-system-lessp): Moved here from mule-util.el. (add-to-coding-system-list): New function. - (make-subsidiary-coding-system, make-coding-system, - define-coding-system-alias): Use it instead of setting + (make-subsidiary-coding-system, make-coding-system) + (define-coding-system-alias): Use it instead of setting coding-system-list directly. 1999-02-07 Dave Love @@ -6723,9 +6723,9 @@ (speedbar-buffers-line-path): Return is dir name only. (speedbar-mode-functions-list): New variable. (speedbar-mouse-item-info): Rewrote to be a replaceable fn. - (speedbar-item-info-file-helper, speedbar-item-info-tag-helper - speedbar-files-item-info speedbar-buffers-item-info): New functions. - (speedbar-fetch-replacement-function,speedbar-add-mode-functions-list): + (speedbar-item-info-file-helper, speedbar-item-info-tag-helpe) + (speedbar-files-item-info speedbar-buffers-item-info): New functions. + (speedbar-fetch-replacement-function, speedbar-add-mode-functions-list): New functions. (speedbar-line-file): Broke out part that fetches file from a line. (speedbar-line-text): New function extracted from speedbar-line-file. @@ -6947,8 +6947,8 @@ (ps-mule-generate-font): If FONT-NAME is a cons cell, use its car. (ps-mule-prepare-font): Likewise. - * international/codepage.el (cp855-decode-table, - cp850-decode-table): Fill some nil entries. + * international/codepage.el (cp855-decode-table) + (cp850-decode-table): Fill some nil entries. 1999-01-16 Dave Love @@ -7152,9 +7152,9 @@ set-coding-priority, so that the internal array of priorities is also updated. - * international/mule-util.el: - (coding-system-change-eol-conversion, - coding-system-change-text-conversion): Don't define here. + * international/mule-util.el + (coding-system-change-eol-conversion) + (coding-system-change-text-conversion): Don't define here. * international/mule-cmds.el: Define them here. Remove the autoload cookies. @@ -7966,8 +7966,8 @@ 1998-12-02 Andre Spiegel - * vc.el (vc-dired-window-configuration, vc-ediff-windows, - vc-ediff-result, vc-dired-switches, vc-dired-terse-mode): + * vc.el (vc-dired-window-configuration, vc-ediff-windows) + (vc-ediff-result, vc-dired-switches, vc-dired-terse-mode): Added defvars to suppress compilation warnings. 1998-11-30 Ken Stevens @@ -8275,7 +8275,7 @@ * textmodes/reftex.el (reftex-finding-files): Group documentation fixed. (reftex-toc-toggle-file-boundary, reftex-toc-toggle-labels) - (reftex-toc-toggle-context,reftex-find-start-point): New functions. + (reftex-toc-toggle-context, reftex-find-start-point): New functions. (reftex-toc-include-labels, reftex-toc-include-context) (reftex-toc-include-file-boundaries, reftex-toc-keep-other-windows): New options. @@ -8574,8 +8574,8 @@ * international/mule-diag.el (describe-coding-system): Describe all flags. - * mail/sendmail.el (sendmail-coding-system, - default-sendmail-coding-system): Doc fix. + * mail/sendmail.el (sendmail-coding-system) + (default-sendmail-coding-system): Doc fix. * simple.el (shell-command-on-region): Doc fix. @@ -9381,8 +9381,8 @@ (eldoc-get-var-docstring): Here also. (eldoc-docstring-first-line): Minimize interim string consing. Call substitute-command-keys on the result. - (eldoc-print-var-docstrings, eldoc-print-docstring, - eldoc-docstring-message): Functions removed. + (eldoc-print-var-docstrings, eldoc-print-docstring) + (eldoc-docstring-message): Functions removed. (eldoc-docstring-format-sym-doc): New function, functionality ripped out of eldoc-docstring-message. (eldoc-get-fnsym-args-string, eldoc-get-var-docstring): Use it. @@ -9408,13 +9408,13 @@ * mail/rmail.el (rmail-movemail-program): Fix customize type. - * mail/feedmail.el (feedmail-x-mailer-line-user-appendage, - feedmail-fiddle-plex-user-list, - feedmail-spray-address-fiddle-plex-list, - feedmail-prompt-before-queue-user-alist, - feedmail-prompt-before-queue-help-supplement, - feedmail-queue-reminder-alist, feedmail-queue-default-file-slug, - feedmail-queue-alternative-mail-header-separator): Fix customize + * mail/feedmail.el (feedmail-x-mailer-line-user-appendage) + (feedmail-fiddle-plex-user-list) + (feedmail-spray-address-fiddle-plex-list) + (feedmail-prompt-before-queue-user-alist) + (feedmail-prompt-before-queue-help-supplement) + (feedmail-queue-reminder-alist, feedmail-queue-default-file-slug) + (feedmail-queue-alternative-mail-header-separator): Fix customize type. * startup.el (site-run-file): Fix customize type. @@ -9427,16 +9427,16 @@ * ps-print.el (ps-font-info-database): Add missing dots in value. Improve layout of customize type. - * net-utils.el (traceroute-program-options, ping-program-options, - ipconfig-program-options, netstat-program-options, - arp-program-options, route-program-options, - nslookup-program-options, ftp-program-options): Fix customize + * net-utils.el (traceroute-program-options, ping-program-options) + (ipconfig-program-options, netstat-program-options) + (arp-program-options, route-program-options) + (nslookup-program-options, ftp-program-options): Fix customize type. - * midnight.el (clean-buffer-list-kill-regexps, - clean-buffer-list-kill-buffer-names, - clean-buffer-list-kill-never-buffer-names, - clean-buffer-list-kill-never-regexps): Fix customize type. + * midnight.el (clean-buffer-list-kill-regexps) + (clean-buffer-list-kill-buffer-names) + (clean-buffer-list-kill-never-buffer-names) + (clean-buffer-list-kill-never-regexps): Fix customize type. * man.el (Man-init-defvars): Avoid trailing nil on Man-filter-list. @@ -9934,16 +9934,16 @@ (ps-mule-prepare-font): New fun. (ps-mule-charset-list): New var. (ps-mule-prologue-generated, ps-mule-prologue): New vars. - (ps-mule-skip-same-charset, ps-mule-find-wrappoint, - ps-mule-plot-string): New funs. + (ps-mule-skip-same-charset, ps-mule-find-wrappoint) + (ps-mule-plot-string): New funs. (ps-mule-cmpchar-prologue-generated, ps-mule-cmpchar-prologue): New vars. - (ps-mule-plot-rule-cmpchar, ps-mule-plot-cmpchar, - ps-mule-prepare-cmpchar-font): New funs. + (ps-mule-plot-rule-cmpchar, ps-mule-plot-cmpchar) + (ps-mule-prepare-cmpchar-font): New funs. (ps-mule-bitmap-prologue-generated, ps-mule-bitmap-prologue): New vars. - (ps-mule-generate-bitmap-prologue, ps-mule-generate-bitmap-font, - ps-mule-generate-bitmap-glyph): New funs. + (ps-mule-generate-bitmap-prologue, ps-mule-generate-bitmap-font) + (ps-mule-generate-bitmap-glyph): New funs. (ps-mule-initialize, ps-mule-begin): New funs. (ps-output-string-prim): Insert string as unibyte. (ps-output-prologue): New fun. === modified file 'lisp/ChangeLog.9' --- lisp/ChangeLog.9 2014-02-17 22:51:36 +0000 +++ lisp/ChangeLog.9 2014-03-09 23:55:11 +0000 @@ -2067,7 +2067,7 @@ * ediff-util.el: Copyright years. (ediff-choose-syntax-table): New function. (ediff-setup): Use ediff-choose-syntax-table. - (ediff-file-checked-out-p,ediff-file-checked-in-p): Check if + (ediff-file-checked-out-p, ediff-file-checked-in-p): Check if vc-state is available. (ediff-make-temp-file): Use ediff-coding-system-for-write. @@ -2089,22 +2089,22 @@ (ediff-patch-file-internal): Use ediff-coding-system-for-write. * ediff-diff.el (ediff-coding-system-for-read): Moved to ediff-init.el. - (ediff-match-diff3-line,ediff-get-diff3-group): Improved pattern. + (ediff-match-diff3-line, ediff-get-diff3-group): Improved pattern. * ediff.el: Date of last update, copyright years. * ediff-wind.el (ediff-setup-control-frame): Nill->nil. - * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy + * viper-ex.el (ex-token-list, ex-cmd-execute): Revamped, courtesy of Scott Bronson. - (ex-cmd-assoc,ex-compile,ex-cmd-one-letr): New functions. - (viper-check-sub,viper-get-ex-command,viper-execute-ex-command): + (ex-cmd-assoc, ex-compile, ex-cmd-one-letr): New functions. + (viper-check-sub, viper-get-ex-command, viper-execute-ex-command): Deleted functions. - (viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new + (viper-get-ex-com-subr, viper-ex, ex-mark): Changed to use the new ex-token-list. (viper-get-ex-address-subr): Convert registers to char data type. - * viper-util.el (viper-int-to-char,viper-char-equal): New functions. + * viper-util.el (viper-int-to-char, viper-char-equal): New functions. (viper-memq-char): Use viper-int-to-char. (viper-file-checked-in-p): Use vc-locking-user, if vc doesn't have vc-locking-state. @@ -2119,18 +2119,18 @@ (viper-read-key-sequence): New function that replaces the previously used advice to read-key-sequence. - * viper-cmd.el (viper-test-com-defun,viper-exec-change) - (viper-exec-Change,viper-execute-com,viper-insert,viper-append) - (viper-Append,viper-Insert,viper-open-line,viper-Open-line) - (viper-open-line-at-point,viper-substitute,viper-overwrite) - (viper-replace-char-subr,viper-forward-word,viper-forward-Word): + * viper-cmd.el (viper-test-com-defun, viper-exec-change) + (viper-exec-Change, viper-execute-com, viper-insert, viper-append) + (viper-Append, viper-Insert, viper-open-line, viper-Open-line) + (viper-open-line-at-point, viper-substitute, viper-overwrite) + (viper-replace-char-subr, viper-forward-word, viper-forward-Word): Got rid of the negative character hack. - (viper-escape-to-state,viper-replace-state-exit-cmd): + (viper-escape-to-state, viper-replace-state-exit-cmd): Use viper-read-key-sequence. (viper-envelop-ESC-key): No need for ad-get-orig-definition. - (viper-minibuffer-standard-hook,viper-read-string-with-history): + (viper-minibuffer-standard-hook, viper-read-string-with-history): Don't override existing minibuffer-setup-hook. - (viper-mark-point,viper-goto-mark-subr,viper-brac-function): + (viper-mark-point, viper-goto-mark-subr, viper-brac-function): Convert registers to char data type. (viper-autoindent): Use viper-indent-line. @@ -4867,12 +4867,12 @@ * ediff-wind.el (ediff-setup-control-frame): Nill->nil. - * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy + * viper-ex.el (ex-token-list, ex-cmd-execute): Revamped, courtesy of Scott Bronson. - (ex-cmd-assoc,ex-cmd-one-letr): New functions. - (viper-check-sub,viper-get-ex-command,viper-execute-ex-command): + (ex-cmd-assoc, ex-cmd-one-letr): New functions. + (viper-check-sub, viper-get-ex-command, viper-execute-ex-command): Deleted functions. - (viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new + (viper-get-ex-com-subr, viper-ex, ex-mark): Changed to use the new ex-token-list. * viper-util.el: Spaces, indentation. @@ -6989,7 +6989,7 @@ * viper-init.el (viper-restore-cursor-type): Added condition-case guard. - * ediff-init.el (ediff-quit-hook,ediff-suspend-hook): + * ediff-init.el (ediff-quit-hook, ediff-suspend-hook): Changed initialization; use add-hook. (ediff-file-remote-p): Use file-local-copy. @@ -8204,9 +8204,9 @@ * viper-cmd.el (viper-change-state-to-vi): Disable overwrite mode. (viper-downgrade-to-insert): Protect against errors in hooks. - * viper-init.el (viper-vi-state-hook,viper-insert-state-hook) - (viper-replace-state-hook,viper-emacs-state-hook): Do cursor handling. - (viper-restore-cursor-type,viper-set-insert-cursor-type): + * viper-init.el (viper-vi-state-hook, viper-insert-state-hook) + (viper-replace-state-hook, viper-emacs-state-hook): Do cursor handling. + (viper-restore-cursor-type, viper-set-insert-cursor-type): New functions. * viper-util.el (viper-memq-char): Bug fixes. @@ -9474,7 +9474,7 @@ Use viper-preserve-cursor-color. Many functions changed to use viper= instead of = when comparing characters. - * viper-util.el (viper-memq-char,viper=): New functions for + * viper-util.el (viper-memq-char, viper=): New functions for working with characters. (viper-change-cursor-color): Fixed buglet. Many functions changed to use viper= instead of = when comparing @@ -9489,14 +9489,14 @@ * ediff-util.el (ediff-setup): Run ediff-before-setup-hook. (ediff-other-buffer): Use selected buffers if in Buffer-menu buffer. (ediff-get-selected-buffers): New function. - * ediff-vers.el (ediff-vc-internal,ediff-rcs-internal) - (ediff-vc-merge-internal,ediff-rcs-merge-internal): + * ediff-vers.el (ediff-vc-internal, ediff-rcs-internal) + (ediff-vc-merge-internal, ediff-rcs-merge-internal): Use save-window-excursion. * ediff-wind.el (ediff-skip-unsuitable-frames): More robust termination check in while loop. * ediff.el (ediff-get-default-file-name): Better defaults when in dired buffer. - (ediff-files,ediff-merge-files,ediff-files3) + (ediff-files, ediff-merge-files, ediff-files3) (ediff-merge-files-with-ancestor): Use ediff-get-default-file-name. 2000-10-28 Dave Love @@ -10973,8 +10973,8 @@ 2000-10-04 Andre Spiegel - * vc-hooks.el (vc-before-save, vc-default-make-version-backups, - vc-version-backup-file-name): New functions. + * vc-hooks.el (vc-before-save, vc-default-make-version-backups) + (vc-version-backup-file-name): New functions. * files.el (basic-save-buffer): Call vc-before-save before saving. @@ -12229,8 +12229,8 @@ * vc.el: Require dired-aux during compilation. (vc-name-assoc-file): Moved to vc-sccs.el. (with-vc-properties): New macro. - (vc-checkin, vc-checkout, vc-revert, vc-cancel-version, - vc-finish-steal): Use it. + (vc-checkin, vc-checkout, vc-revert, vc-cancel-version) + (vc-finish-steal): Use it. (vc-cancel-version): Moved RCS-specific code to vc-rcs.el. The call to the backend-specific function is now supposed to do the checkout, too. @@ -12844,11 +12844,10 @@ 2000-09-04 Stefan Monnier - * vc-rcs-hooks.el (vc-rcs-templates-grabbed, - vc-rcs-grab-templates) + * vc-rcs-hooks.el (vc-rcs-templates-grabbed, vc-rcs-grab-templates) (vc-rcs-registered): Remove. The default function works as well. - * vc-sccs-hooks.el (vc-sccs-templates-grabbed, - vc-sccs-grab-templates) + * vc-sccs-hooks.el (vc-sccs-templates-grabbed) + (vc-sccs-grab-templates) (vc-sccs-registered): Remove. The default function works as well. * vc.el (vc-version-diff): Left out a vc- in call to @@ -13070,8 +13069,8 @@ (vc-rcs-trunk-p, vc-rcs-branch-part): Move to vc-rcs-hooks. (vc-rcs-backend-release-p): Remove (use vc-rcs-release-p). (vc-release-greater-or-equal-p): Move from vc. - (vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part, - vc-rcs-minor-part, vc-rcs-previous-version): Remove duplicates. + (vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part) + (vc-rcs-minor-part, vc-rcs-previous-version): Remove duplicates. (vc-rcs-checkout): Add a missing `new-version' argument in the call to vc-rcs-latest-on-branch-p. Hopefully that was the right one. @@ -13144,7 +13143,7 @@ 2000-09-04 Martin Lorentzson - * vc-cvs.el (vc-cvs-revert,vc-cvs-checkout): References to + * vc-cvs.el (vc-cvs-revert, vc-cvs-checkout): References to `vc-checkout-model' updated to `vc-cvs-update-model'. 2000-09-04 Andre Spiegel @@ -13241,7 +13240,7 @@ 2000-09-04 Martin Lorentzson - * vc.el (vc-workfile-unchanged-p,vc-diff,vc-version-diff): + * vc.el (vc-workfile-unchanged-p, vc-diff, vc-version-diff): Update to use the vc-BACKEND-diff functions instead. `vc-diff' is now working. @@ -13261,7 +13260,7 @@ This checkin is made with our new VC code base for the very first time. A simple `(vc-checkin (buffer-file-name))' was used to perform it. - * vc-cvs.el (vc-cvs-revert,vc-cvs-checkout): Function calls to + * vc-cvs.el (vc-cvs-revert, vc-cvs-checkout): Function calls to `vc-checkout-required' updated to `vc-cvs-uses-locking'. * vc-hooks.el (vc-backend-hook-functions): `vc-checkout-required' @@ -13716,8 +13715,8 @@ * vc-rcs-hooks.el: Require vc-hooks when compiling. (vc-rcs-master-templates): Improve :type. - (vc-rcsdiff-knows-brief, vc-rcs-lock-from-diff, - vc-master-workfile-version): Moved from vc-hooks. + (vc-rcsdiff-knows-brief, vc-rcs-lock-from-diff) + (vc-master-workfile-version): Moved from vc-hooks. * vc-sccs-hooks.el: Require vc-hooks when compiling. (vc-sccs-master-templates): Improve :type. @@ -15397,9 +15396,9 @@ * progmodes/cc-cmds.el (c-indent-command): Obey c-syntactic-indentation. - * progmodes/cc-cmds.el (c-electric-brace, c-electric-slash, - c-electric-star, c-electric-semi&comma, c-electric-colon, - c-electric-lt-gt, c-electric-paren): Don't reindent old lines + * progmodes/cc-cmds.el (c-electric-brace, c-electric-slash) + (c-electric-star, c-electric-semi&comma, c-electric-colon) + (c-electric-lt-gt, c-electric-paren): Don't reindent old lines when c-syntactic-indentation is nil. * progmodes/cc-engine.el (c-beginning-of-statement-1): Fixed bug where @@ -15467,8 +15466,8 @@ * progmodes/cc-styles.el (c-copy-tree): Obsolete. The standard function copy-alist is sufficient now. - * progmodes/cc-styles.el (c-set-style, c-set-style-1, - c-get-style-variables): Fixes to variable initialization so + * progmodes/cc-styles.el (c-set-style, c-set-style-1) + (c-get-style-variables): Fixes to variable initialization so that duplicate entries in styles have the same effect regardless of DONT-OVERRIDE. @@ -16405,8 +16404,8 @@ Support for bibentry. (reftex-compile-variables): Fixed problem with end of section-re. - * textmodes/reftex-dcr.el (reftex-view-crossref, - reftex-view-crossref-from-bibtex): + * textmodes/reftex-dcr.el (reftex-view-crossref) + (reftex-view-crossref-from-bibtex): Deal with changed `reftex-find-citation-regexp-format'. (reftex-view-regexp-match, reftex-view-crossref-from-bibtex): Replaced `remprop' with `put'. @@ -17389,8 +17388,8 @@ * international/mule-conf.el: Specify CHARSET-ID explicitly for private charsets. - (mule-unicode-0100-24ff, japanese-jisx0213-1, - japanese-jisx0213-2): New charsets. + (mule-unicode-0100-24ff, japanese-jisx0213-1) + (japanese-jisx0213-2): New charsets. * international/fontset.el: Setup default fontset for new charsets. @@ -17415,7 +17414,7 @@ * ediff-diff.el (ediff-forward-word): Take syntactic word class into account. - (ediff-test-utility,ediff-diff-mandatory-option) + (ediff-test-utility, ediff-diff-mandatory-option) (ediff-reset-diff-options): Utilities for proper initialization of ediff-diff-options and ediff-diff3-options on Windows. @@ -18474,11 +18473,11 @@ * textmodes/ispell.el (ispell-cmd-args, ispell-output-buffer) (ispell-session-buffer): New variables. - (ispell-start-process, ispell-process-status, - ispell-accept-output, ispell-send-string): New functions, for + (ispell-start-process, ispell-process-status) + (ispell-accept-output, ispell-send-string): New functions, for Ispell invocation when async subprocesses aren't supported. - (ispell-word, ispell-pdict-save, ispell-command-loop, - ispell-process-line, ispell-buffer-local-parsing): Replace calls + (ispell-word, ispell-pdict-save, ispell-command-loop) + (ispell-process-line, ispell-buffer-local-parsing): Replace calls to process-send-string with calls to ispell-send-string, and accept-process-output with ispell-accept-output. (ispell-init-process): Call ispell-process-status instead of === modified file 'lisp/gnus/ChangeLog.1' --- lisp/gnus/ChangeLog.1 2014-01-16 08:34:43 +0000 +++ lisp/gnus/ChangeLog.1 2014-03-09 23:55:11 +0000 @@ -277,8 +277,8 @@ 1998-08-26 Mike McEwan * gnus-sum.el (gnus-build-all-threads): `save-excursion' and - `set-buffer' back to `gnus-summary-buffer' in order to access - buffer-local variables. + `set-buffer' back to `gnus-summary-buffer' in order to access + buffer-local variables. 1998-08-26 Lars Magne Ingebrigtsen @@ -910,10 +910,10 @@ 1998-07-11 Mike McEwan * gnus-agent.el (gnus-agent-fetch-headers): Note last fetched - headers per sesion to aid expiry in `headers only' groups. + headers per sesion to aid expiry in `headers only' groups. * gnus-agent.el (gnus-agent-expire): Update group info to add - expired articles to list of read articles and prevent + expired articles to list of read articles and prevent re-fetching. 1998-07-12 Lars Magne Ingebrigtsen @@ -1266,7 +1266,7 @@ 1998-06-05 Hrvoje Niksic * nnmail.el (nnmail-get-split-group): Don't regexp-quote - nnmail-procmail-suffix. + nnmail-procmail-suffix. 1998-06-24 Kim-Minh Kaplan @@ -1993,9 +1993,9 @@ (gnus-picons-setup-buffer): New function. (gnus-picons-set-buffer): Use them. (gnus-picons-display-x-face): Put back the `buf' binding: it is - needed when `gnus-picons-display-where' is not set to article. - Also move the X-Face to the left, near the address. It seems more - logical. + needed when `gnus-picons-display-where' is not set to article. + Also move the X-Face to the left, near the address. It seems more + logical. 1998-02-28 Lars Magne Ingebrigtsen @@ -2645,7 +2645,7 @@ (gnus-split-methods): Add default values for choices. * gnus-score.el (gnus-home-score-file): Add non-nil default for - function. + function. (gnus-home-adapt-file): Ditto. * gnus-sum.el (gnus-move-split-methods): Add default values for @@ -2711,7 +2711,7 @@ 1997-12-05 Danny Siu * nndoc.el (nndoc-babyl-body-begin): quote the regexp for the - string "*** EOOH ***" properly. + string "*** EOOH ***" properly. (nndoc-babyl-head-begin): Same as above. 1997-12-14 Lars Magne Ingebrigtsen @@ -2759,10 +2759,10 @@ 1997-11-27 MORIOKA Tomohiko * nnmail.el (nnmail-file-coding-system): Use `raw-text' in - default. + default. * nnheader.el (nnheader-file-coding-system): Use `raw-text' in - default. + default. 1997-12-06 Kim-Minh Kaplan @@ -3220,7 +3220,7 @@ 1997-10-16 Colin Rafferty * message.el (message-make-fqdn): Made certain that user-mail is - not nil. + not nil. 1997-10-25 David S. Goldberg ------------------------------------------------------------ revno: 116711 fixes bug: http://debbugs.gnu.org/16892 committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-03-09 15:38:15 -0700 message: Fix emacsclient terminal corruption when in background. * emacsclient.c (handle_sigcont): Check for tcgetpgrp failure. Cancel the continue only if tty. Send SIGTTIN to the process group, not SIGSTOP to self, as this is what the glibc manual recommends. (main): If tty, and if started in the background, send SIGTTIN to the process group. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2014-03-03 04:57:26 +0000 +++ lib-src/ChangeLog 2014-03-09 22:38:15 +0000 @@ -1,3 +1,13 @@ +2014-03-09 Paul Eggert + + Fix emacsclient terminal corruption when in background (Bug#16892). + * emacsclient.c (handle_sigcont): Check for tcgetpgrp failure. + Cancel the continue only if tty. Send SIGTTIN to the process + group, not SIGSTOP to self, as this is what the glibc manual + recommends. + (main): If tty, and if started in the background, send SIGTTIN + to the process group. + 2014-02-25 Andreas Amann (tiny change) Fix emacsclient's handling of SIGCONT (Bug#16883). === modified file 'lib-src/emacsclient.c' --- lib-src/emacsclient.c 2014-02-25 19:06:53 +0000 +++ lib-src/emacsclient.c 2014-03-09 22:38:15 +0000 @@ -1105,16 +1105,18 @@ handle_sigcont (int signalnum) { int old_errno = errno; + pid_t pgrp = getpgrp (); + pid_t tcpgrp = tcgetpgrp (1); - if (tcgetpgrp (1) == getpgrp ()) + if (tcpgrp == pgrp) { /* We are in the foreground. */ send_to_emacs (emacs_socket, "-resume \n"); } - else if (tty) + else if (0 <= tcpgrp && tty) { /* We are in the background; cancel the continue. */ - raise (SIGSTOP); + kill (-pgrp, SIGTTIN); } signal (signalnum, handle_sigcont); @@ -1554,6 +1556,14 @@ exit (EXIT_FAILURE); } + if (tty) + { + pid_t pgrp = getpgrp (); + pid_t tcpgrp = tcgetpgrp (1); + if (0 <= tcpgrp && tcpgrp != pgrp) + kill (-pgrp, SIGTTIN); + } + /* If alternate_editor is the empty string, start the emacs daemon in case of failure to connect. */ start_daemon_if_needed = (alternate_editor ------------------------------------------------------------ revno: 116710 committer: Juri Linkov branch nick: trunk timestamp: Sun 2014-03-09 23:55:35 +0200 message: * lisp/ansi-color.el (ansi-color-names-vector): Copy default colors from `xterm-standard-colors' that look well on the default white background (and also on the black background) to avoid illegible color combinations like yello-on-white and white-on-white. http://lists.gnu.org/archive/html/emacs-devel/2014-02/msg00157.html diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-08 22:26:20 +0000 +++ lisp/ChangeLog 2014-03-09 21:55:35 +0000 @@ -1,3 +1,11 @@ +2014-03-09 Juri Linkov + + * ansi-color.el (ansi-color-names-vector): Copy default colors + from `xterm-standard-colors' that look well on the default white + background (and also on the black background) to avoid illegible + color combinations like yello-on-white and white-on-white. + http://lists.gnu.org/archive/html/emacs-devel/2014-02/msg00157.html + 2014-03-08 Juanma Barranquero * frameset.el (frameset-restore): When no frame is visible, do not === modified file 'lisp/ansi-color.el' --- lisp/ansi-color.el 2014-01-01 07:43:34 +0000 +++ lisp/ansi-color.el 2014-03-09 21:55:35 +0000 @@ -117,7 +117,7 @@ :group 'ansi-colors) (defcustom ansi-color-names-vector - ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"] + ["black" "red3" "green3" "yellow3" "blue2" "magenta3" "cyan3" "gray90"] "Colors used for SGR control sequences determining a color. This vector holds the colors used for SGR control sequences parameters 30 to 37 (foreground colors) and 40 to 47 (background colors). @@ -147,6 +147,7 @@ (choice color (cons color color))) :set 'ansi-color-map-update :initialize 'custom-initialize-default + :version "24.4" ; default colors copied from `xterm-standard-colors' :group 'ansi-colors) (defconst ansi-color-regexp "\033\\[\\([0-9;]*m\\)" ------------------------------------------------------------ revno: 116709 committer: martin rudalics branch nick: trunk timestamp: Sun 2014-03-09 12:36:51 +0100 message: Update docs for window dividers and `window-text-pixel-size'. * xdisp.c (Fwindow_text_pixel_size): Adjust doc-string. * elisp.texi (Top): Rename section "Width" to "Size of Displayed Text". * text.texi (Primitive Indent): * strings.texi (String Basics): * sequences.texi (Sequence Functions): Update references accordingly. * display.texi (Size of Displayed Text): Rename section from "Width". Add description for `window-text-pixel-size'. (Window Dividers): Reword description of window dividers. * frames.texi (Layout Parameters): Improve description of window divider parameters. * windows.texi (Window Sizes): Add descriptions of `window-mode-line-height' and `window-header-line-height'. (Coordinates and Windows): Mention window dividers. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2014-03-07 15:11:12 +0000 +++ doc/lispref/ChangeLog 2014-03-09 11:36:51 +0000 @@ -1,3 +1,20 @@ +2014-03-09 Martin Rudalics + + * elisp.texi (Top): Rename section "Width" to "Size of Displayed + Text". + * text.texi (Primitive Indent): + * strings.texi (String Basics): + * sequences.texi (Sequence Functions): Update references + accordingly. + * display.texi (Size of Displayed Text): Rename section from + "Width". Add description for `window-text-pixel-size'. + (Window Dividers): Reword description of window dividers. + * frames.texi (Layout Parameters): Improve description of window + divider parameters. + * windows.texi (Window Sizes): Add descriptions of + `window-mode-line-height' and `window-header-line-height'. + (Coordinates and Windows): Mention window dividers. + 2014-03-07 Martin Rudalics * buffers.texi (The Buffer List): Rename node to Buffer List. === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2014-03-07 19:12:31 +0000 +++ doc/lispref/display.texi 2014-03-09 11:36:51 +0000 @@ -18,7 +18,7 @@ * Selective Display:: Hiding part of the buffer text (the old way). * Temporary Displays:: Displays that go away automatically. * Overlays:: Use overlays to highlight parts of the buffer. -* Width:: How wide a character or string is on the screen. +* Size of Displayed Text:: How large displayed text is. * Line Height:: Controlling the height of lines. * Faces:: A face defines a graphics style for text characters: font, colors, etc. @@ -1765,8 +1765,8 @@ (point))) @end smallexample -@node Width -@section Width +@node Size of Displayed Text +@section Size of Displayed Text Since not all characters have the same width, these functions let you check the width of a character. @xref{Primitive Indent}, and @@ -1823,6 +1823,54 @@ @end example @end defun +The following function returns the size in pixels of text as if it were +displayed in a given window. This function is used by +@code{fit-window-to-buffer} (@pxref{Resizing Windows}) and +@code{fit-frame-to-buffer} (@pxref{Size and Position}) to make a window +exactly as large as the text it contains. + +@defun window-text-pixel-size &optional window from to x-limit y-limit mode-and-header-line +This function returns the size of the text of @var{window}'s buffer in +pixels. @var{window} must be a live window and defaults to the selected +one. The return value is a cons of the maximum pixel-width of any text +line and the maximum pixel-height of all text lines. + +The optional argument @var{from}, if non-@code{nil}, specifies the first +text position to consider and defaults to the minimum accessible +position of the buffer. If @var{from} is @code{t}, it uses the minimum +accessible position that is not a newline character. The optional +argument @var{to}, if non-@code{nil}, specifies the last text position +to consider and defaults to the maximum accessible position of the +buffer. If @var{to} is @code{t}, it uses the maximum accessible +position that is not a newline character. + +The optional argument @var{x-limit}, if non-@code{nil}, specifies the +maximum pixel-width that can be returned. @var{x-limit} @code{nil} or +omitted, means to use the pixel-width of @var{window}'s body +(@pxref{Window Sizes}); this is useful when the caller does not intend +to change the width of @var{window}. Otherwise, the caller should +specify here the maximum width @var{window}'s body may assume. Text +whose x-coordinate is beyond @var{x-limit} is ignored. Since +calculating the width of long lines can take some time, it's always a +good idea to make this argument as small as needed; in particular, if +the buffer might contain long lines that will be truncated anyway. + +The optional argument @var{y-limit}, if non-@code{nil}, specifies the +maximum pixel-height that can be returned. Text lines whose +y-coordinate is beyond @var{y-limit} are ignored. Since calculating the +pixel-height of a large buffer can take some time, it makes sense to +specify this argument; in particular, if the caller does not know the +size of the buffer. + +The optional argument @var{mode-and-header-line} @code{nil} or omitted +means to not include the height of the mode- or header-line of +@var{window} in the return value. If it is either the symbol +@code{mode-line} or @code{header-line}, include only the height of that +line, if present, in the return value. If it is @code{t}, include the +height of both, if present, in the return value. +@end defun + + @node Line Height @section Line Height @cindex line height @@ -3904,28 +3952,28 @@ @cindex bottom dividers Window dividers are bars drawn between a frame's windows. A ``right'' -divider is drawn between a window and its sibling(s) on the right. Its -width is specified by the frame parameter @code{right-divider-width}. A -``bottom'' divider is drawn between a window and its sibling(s) on the -bottom or the echo area. Its width is specified by the frame parameter -@code{bottom-divider-width}. In either case, specifying a width of zero -means to not draw such dividers. @xref{Layout Parameters}. +divider is drawn between a window and any adjacent windows on the right. +Its width (thickness) is specified by the frame parameter +@code{right-divider-width}. A ``bottom'' divider is drawn between a +window and adjacent windows on the bottom or the echo area. Its width +is specified by the frame parameter @code{bottom-divider-width}. In +either case, specifying a width of zero means to not draw such dividers. +@xref{Layout Parameters}. Technically, a right divider ``belongs'' to the window on its left, -which means that its width is part of the total width of that window. A -bottom divider ``belongs'' to the window above it, which means that its -height is part of the total height of that window. @xref{Window Sizes}. -When a window has both, a right and a bottom divider, the bottom divider -``prevails''. This means that the width of the bottom divider equals -the total width of the window while the height of the right divider -equals the total height of the window minus the height of the bottom -divider. +which means that its width contributes to the total width of that +window. A bottom divider ``belongs'' to the window above it, which +means that its width contributes to the total height of that window. +@xref{Window Sizes}. When a window has both, a right and a bottom +divider, the bottom divider ``prevails''. This means that a bottom +divider is drawn over the full total width of its window while the right +divider ends above the bottom divider. Dividers can be dragged with the mouse and are therefore useful for adjusting the sizes of adjacent windows with the mouse. They also serve -to set windows visually apart from their siblings when no scroll bars or -mode lines are present. The following three faces allow to customize -the appearance of dividers: +to visually set apart adjacent windows when no scroll bars or mode lines +are present. The following three faces allow to customize the +appearance of dividers: @table @code @item window-divider @@ -3944,6 +3992,23 @@ same value used for the @code{window-divider} face. @end table +You can get the sizes of the dividers of a specific window with the +following two functions. + +@defun window-right-divider-width &optional window +Return the width (thickness) in pixels of @var{window}'s right divider. +@var{window} must be a live window and defaults to the selected one. +The return value is always zero for a rightmost window. +@end defun + +@defun window-bottom-divider-width &optional window +Return the width (thickness) in pixels of @var{window}'s bottom divider. +@var{window} must be a live window and defaults to the selected one. +The return value is zero for the minibuffer window or a bottommost +window on a minibuffer-less frame. +@end defun + + @node Display Property @section The @code{display} Property @cindex display specification === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2014-03-07 15:11:12 +0000 +++ doc/lispref/elisp.texi 2014-03-09 11:36:51 +0000 @@ -1338,7 +1338,7 @@ * Selective Display:: Hiding part of the buffer text (the old way). * Temporary Displays:: Displays that go away automatically. * Overlays:: Use overlays to highlight parts of the buffer. -* Width:: How wide a character or string is on the screen. +* Size of Displayed Text:: How large displayed text is. * Line Height:: Controlling the height of lines. * Faces:: A face defines a graphics style for text characters: font, colors, etc. === modified file 'doc/lispref/frames.texi' --- doc/lispref/frames.texi 2014-03-06 13:41:58 +0000 +++ doc/lispref/frames.texi 2014-03-09 11:36:51 +0000 @@ -747,15 +747,15 @@ @vindex right-divider-width, a frame parameter @item right-divider-width -The width of the right divider (@pxref{Window Dividers}) of any window -on the frame, in pixels. A value of zero means to not draw right -dividers. +The width (thickness) reserved for the right divider (@pxref{Window +Dividers}) of any window on the frame, in pixels. A value of zero means +to not draw right dividers. @vindex bottom-divider-width, a frame parameter @item bottom-divider-width -The width of the bottom divider (@pxref{Window Dividers}) of any window -on the frame, in pixels. A value of zero means to not draw bottom -dividers. +The width (thickness) reserved for the bottom divider (@pxref{Window +Dividers}) of any window on the frame, in pixels. A value of zero means +to not draw bottom dividers. @vindex menu-bar-lines frame parameter @item menu-bar-lines === modified file 'doc/lispref/sequences.texi' --- doc/lispref/sequences.texi 2014-01-05 01:33:33 +0000 +++ doc/lispref/sequences.texi 2014-03-09 11:36:51 +0000 @@ -107,9 +107,9 @@ @noindent See also @code{string-bytes}, in @ref{Text Representations}. -If you need to compute the width of a string on display, you should -use @code{string-width} (@pxref{Width}), not @code{length}, since -@code{length} only counts the number of characters, but does not +If you need to compute the width of a string on display, you should use +@code{string-width} (@pxref{Size of Displayed Text}), not @code{length}, +since @code{length} only counts the number of characters, but does not account for the display width of each character. @defun elt sequence index === modified file 'doc/lispref/strings.texi' --- doc/lispref/strings.texi 2014-01-10 17:54:32 +0000 +++ doc/lispref/strings.texi 2014-03-09 11:36:51 +0000 @@ -48,13 +48,13 @@ by a distinguished character code. Since strings are arrays, and therefore sequences as well, you can -operate on them with the general array and sequence functions -documented in @ref{Sequences Arrays Vectors}. For example, you can -access or change individual characters in a string using the functions -@code{aref} and @code{aset} (@pxref{Array Functions}). However, note -that @code{length} should @emph{not} be used for computing the width -of a string on display; use @code{string-width} (@pxref{Width}) -instead. +operate on them with the general array and sequence functions documented +in @ref{Sequences Arrays Vectors}. For example, you can access or +change individual characters in a string using the functions @code{aref} +and @code{aset} (@pxref{Array Functions}). However, note that +@code{length} should @emph{not} be used for computing the width of a +string on display; use @code{string-width} (@pxref{Size of Displayed +Text}) instead. There are two text representations for non-@acronym{ASCII} characters in Emacs strings (and in buffers): unibyte and multibyte. === modified file 'doc/lispref/text.texi' --- doc/lispref/text.texi 2014-03-02 03:34:36 +0000 +++ doc/lispref/text.texi 2014-03-09 11:36:51 +0000 @@ -2202,7 +2202,7 @@ This section describes the primitive functions used to count and insert indentation. The functions in the following sections use these -primitives. @xref{Width}, for related functions. +primitives. @xref{Size of Displayed Text}, for related functions. @defun current-indentation @comment !!Type Primitive Function === modified file 'doc/lispref/windows.texi' --- doc/lispref/windows.texi 2014-03-07 15:11:12 +0000 +++ doc/lispref/windows.texi 2014-03-09 11:36:51 +0000 @@ -618,6 +618,29 @@ @code{window-width} is an alias for @code{window-body-width}. These aliases are considered obsolete and will be removed in the future. + The pixel heights of a window's mode and header line can be retrieved +with the functions given below. Their return value is usually accurate +unless the window has not been displayed before: In that case, the +return value is based on an estimate of the font used for the window's +frame. + +@defun window-mode-line-height &optional window +This function returns the height in pixels of @var{window}'s mode line. +@var{window} must be a live window and defaults to the selected one. If +@var{window} has no mode line, the return value is zero. +@end defun + +@defun window-header-line-height &optional window +This function returns the height in pixels of @var{window}'s header +line. @var{window} must be a live window and defaults to the selected +one. If @var{window} has no header line, the return value is zero. +@end defun + +Functions for retrieving the height and/or width of window dividers +(@pxref{Window Dividers}), fringes (@pxref{Fringes}), scroll bars +(@pxref{Scroll Bars}), and display margins (@pxref{Display Margins}) are +described in the corresponding sections. + @cindex fixed-size window @vindex window-min-height @vindex window-min-width @@ -3476,18 +3499,18 @@ right of the rightmost column, and the Y coordinate one row down from the bottommost row. -Note that these are the actual outer edges of the window, including -any header line, mode line, scroll bar, fringes, and display margins. -On a text terminal, if the window has a neighbor on its right, its -right edge includes the separator line between the window and its +Note that these are the actual outer edges of the window, including any +header line, mode line, scroll bar, fringes, window divider and display +margins. On a text terminal, if the window has a neighbor on its right, +its right edge includes the separator line between the window and its neighbor. @end defun @defun window-inside-edges &optional window This function is similar to @code{window-edges}, but the returned edge values are for the text area of the window. They exclude any header -line, mode line, scroll bar, fringes, display margins, and vertical -separator. +line, mode line, scroll bar, fringes, window divider, display margins, +and vertical separator. @end defun @defun window-top-line &optional window @@ -3536,6 +3559,14 @@ @item header-line The coordinates are in the header line of @var{window}. +@item right-divider +The coordinates are in the divider separating @var{window} from a +window on the right. + +@item right-divider +The coordinates are in the divider separating @var{window} from a +window beneath. + @item vertical-line The coordinates are in the vertical line between @var{window} and its neighbor to the right. This value occurs only if the window doesn't @@ -3597,6 +3628,17 @@ the display screen. @var{window} must specify a live window. @end defun +@defun window-pixel-left &optional window +This function returns the left pixel edge of window @var{window}. +@var{window} must be a valid window and defaults to the selected one. +@end defun + +@defun window-pixel-top &optional window +This function returns the top pixel edge of window @var{window}. +@var{window} must be a valid window and defaults to the selected one. +@end defun + + @node Window Configurations @section Window Configurations @cindex window configurations === modified file 'src/ChangeLog' --- src/ChangeLog 2014-03-08 15:49:59 +0000 +++ src/ChangeLog 2014-03-09 11:36:51 +0000 @@ -1,9 +1,13 @@ +2014-03-09 Martin Rudalics + + * xdisp.c (Fwindow_text_pixel_size): Adjust doc-string. + 2014-03-08 Jan Djärv * nsterm.h (MAC_OS_X_VERSION_10_9): Add. - * nsterm.m (constrainFrameRect:toScreen:): Constrain normally when frame - is only on one screen (Bug#14713). + * nsterm.m (constrainFrameRect:toScreen:): Constrain normally + when frame is only on one screen (Bug#14713). 2014-03-08 Eli Zaretskii === modified file 'src/xdisp.c' --- src/xdisp.c 2014-03-08 13:18:43 +0000 +++ src/xdisp.c 2014-03-09 11:36:51 +0000 @@ -9600,19 +9600,23 @@ defaults to the maximum accessible position of the buffer. If TO is t, use the maximum accessible position that is not a newline character. -The optional argument X_LIMIT, if non-nil, specifies the maximum text -width that can be returned. X_LIMIT nil or omitted, means to use the +The optional argument X-LIMIT, if non-nil, specifies the maximum text +width that can be returned. X-LIMIT nil or omitted, means to use the pixel-width of WINDOW's body; use this if you do not intend to change the width of WINDOW. Use the maximum width WINDOW may assume if you -intend to change WINDOW's width. +intend to change WINDOW's width. In any case, text whose x-coordinate +is beyond X-LIMIT is ignored. Since calculating the width of long lines +can take some time, it's always a good idea to make this argument as +small as possible; in particular, if the buffer contains long lines that +shall be truncated anyway. -The optional argument Y_LIMIT, if non-nil, specifies the maximum text +The optional argument Y-LIMIT, if non-nil, specifies the maximum text height that can be returned. Text lines whose y-coordinate is beyond -Y_LIMIT are ignored. Since calculating the text height of a large +Y-LIMIT are ignored. Since calculating the text height of a large buffer can take some time, it makes sense to specify this argument if the size of the buffer is unknown. -Optional argument MODE_AND_HEADER_LINE nil or omitted means do not +Optional argument MODE-AND-HEADER-LINE nil or omitted means do not include the height of the mode- or header-line of WINDOW in the return value. If it is either the symbol `mode-line' or `header-line', include only the height of that line, if present, in the return value. If t, ------------------------------------------------------------ revno: 116708 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2014-03-08 23:26:20 +0100 message: lisp/frameset.el: Avoid computing frame-list unnecessarily. (frameset-restore): When no frame is visible, do not generate a list of frames, just make visible the selected one. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-08 06:56:22 +0000 +++ lisp/ChangeLog 2014-03-08 22:26:20 +0000 @@ -1,3 +1,8 @@ +2014-03-08 Juanma Barranquero + + * frameset.el (frameset-restore): When no frame is visible, do not + generate a list of frames, just make visible the selected one. + 2014-03-08 Dmitry Gutov * vc/vc-git.el (vc-git-command): Turn FILE-OR-LIST into nil when === modified file 'lisp/frameset.el' --- lisp/frameset.el 2014-03-05 16:22:47 +0000 +++ lisp/frameset.el 2014-03-08 22:26:20 +0000 @@ -1204,7 +1204,7 @@ ;; Make sure there's at least one visible frame. (unless (or (daemonp) (visible-frame-list)) - (make-frame-visible (car (frame-list)))))) + (make-frame-visible (selected-frame))))) ;; Register support