Now on revision 106004. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 106004 committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-10-06 09:25:26 +0000 message: shr.el (shr-tag-img): Don't get images displayed in tables. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-03 23:27:29 +0000 +++ lisp/gnus/ChangeLog 2011-10-06 09:25:26 +0000 @@ -1,3 +1,7 @@ +2011-10-06 Katsumi Yamaoka + + * shr.el (shr-tag-img): Don't get images displayed in tables. + 2011-10-03 Glenn Morris * gnus-group.el (gnus-bug-group-download-format-alist): Once again get === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2011-10-02 22:03:55 +0000 +++ lisp/gnus/shr.el 2011-10-06 09:25:26 +0000 @@ -914,12 +914,13 @@ (shr-encode-url url) 'shr-image-fetched (list (current-buffer) start (set-marker (make-marker) (1- (point)))) t))) - (put-text-property start (point) 'keymap shr-map) - (put-text-property start (point) 'shr-alt alt) - (put-text-property start (point) 'image-url url) - (put-text-property start (point) 'image-displayer - (shr-image-displayer shr-content-function)) - (put-text-property start (point) 'help-echo alt) + (when (zerop shr-table-depth) ;; We are not in a table. + (put-text-property start (point) 'keymap shr-map) + (put-text-property start (point) 'shr-alt alt) + (put-text-property start (point) 'image-url url) + (put-text-property start (point) 'image-displayer + (shr-image-displayer shr-content-function)) + (put-text-property start (point) 'help-echo alt)) (setq shr-state 'image))))) (defun shr-tag-pre (cont) ------------------------------------------------------------ revno: 106003 fixes bug(s): http://debbugs.gnu.org/9675 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-10-05 17:39:54 -0400 message: * display.texi (Low-Level Font, Face Attributes, Font Lookup): Fix xref. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-10-01 22:16:24 +0000 +++ doc/lispref/ChangeLog 2011-10-05 21:39:54 +0000 @@ -1,3 +1,8 @@ +2011-10-05 Chong Yidong + + * display.texi (Low-Level Font, Face Attributes, Font Lookup): Fix + Emacs manual xref (Bug#9675). + 2011-10-01 Chong Yidong * windows.texi (Textual Scrolling): Document scroll-up-command, === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2011-09-24 14:38:16 +0000 +++ doc/lispref/display.texi 2011-10-05 21:39:54 +0000 @@ -2148,12 +2148,11 @@ entity, or a string. Emacs converts such values to an appropriate font object, and stores that font object as the actual attribute value. If you specify a string, the contents of the string should be -a font name (@pxref{Font X,, Font Specification Options, emacs, The -GNU Emacs Manual}); if the font name is an XLFD containing wildcards, -Emacs chooses the first font matching those wildcards. Specifying -this attribute also changes the values of the @code{:family}, -@code{:foundry}, @code{:width}, @code{:height}, @code{:weight}, and -@code{:slant} attributes. +a font name (@pxref{Fonts,,, emacs, The GNU Emacs Manual}); if the +font name is an XLFD containing wildcards, Emacs chooses the first +font matching those wildcards. Specifying this attribute also changes +the values of the @code{:family}, @code{:foundry}, @code{:width}, +@code{:height}, @code{:weight}, and @code{:slant} attributes. @item :inherit The name of a face from which to inherit attributes, or a list of face @@ -2854,11 +2853,11 @@ @defun x-list-fonts name &optional reference-face frame maximum width This function returns a list of available font names that match @var{name}. @var{name} should be a string containing a font name in -either the Fontconfig, GTK, or XLFD format (@pxref{Font X,, Font -Specification Options, emacs, The GNU Emacs Manual}). Within an XLFD -string, wildcard characters may be used: the @samp{*} character -matches any substring, and the @samp{?} character matches any single -character. Case is ignored when matching font names. +either the Fontconfig, GTK, or XLFD format (@pxref{Fonts,,, emacs, The +GNU Emacs Manual}). Within an XLFD string, wildcard characters may be +used: the @samp{*} character matches any substring, and the @samp{?} +character matches any single character. Case is ignored when matching +font names. If the optional arguments @var{reference-face} and @var{frame} are specified, the returned list includes only fonts that are the same @@ -3108,8 +3107,7 @@ @table @code @item :name The font name (a string), in either XLFD, Fontconfig, or GTK format. -@xref{Font X,, Font Specification Options, emacs, The GNU Emacs -Manual}. +@xref{Fonts,,, emacs, The GNU Emacs Manual}. @item :family @itemx :foundry @@ -3226,10 +3224,9 @@ @defun font-xlfd-name font &optional fold-wildcards This function returns the XLFD (X Logical Font Descriptor), a string, -matching @var{font}. @xref{Font X,, Font Specification Options, -emacs, The GNU Emacs Manual}, for information about XLFDs. If the -name is too long for an XLFD (which can contain at most 255 -characters), the function returns @code{nil}. +matching @var{font}. @xref{Fonts,,, emacs, The GNU Emacs Manual}, for +information about XLFDs. If the name is too long for an XLFD (which +can contain at most 255 characters), the function returns @code{nil}. If the optional argument @var{fold-wildcards} is non-@code{nil}, consecutive wildcards in the XLFD are folded into one. ------------------------------------------------------------ revno: 106002 committer: martin rudalics branch nick: trunk timestamp: Wed 2011-10-05 10:59:13 +0200 message: New functions window-point-1 and set-window-point-1. * window.el (window-point-1, set-window-point-1): New functions. (window-in-direction, record-window-buffer, window-state-get-1) (display-buffer-record-window): Use window-point-1 instead of window-point. (set-window-buffer-start-and-point): Use set-window-point-1. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-05 06:49:53 +0000 +++ lisp/ChangeLog 2011-10-05 08:59:13 +0000 @@ -4,6 +4,11 @@ frame-auto-delete. Suggested by Stefan Monnier. (window--delete): Call frame-auto-hide-function instead of investigating frame-auto-delete. + (window-point-1, set-window-point-1): New functions. + (window-in-direction, record-window-buffer, window-state-get-1) + (display-buffer-record-window): Use window-point-1 instead of + window-point. + (set-window-buffer-start-and-point): Use set-window-point-1. 2011-10-05 Stefan Monnier === modified file 'lisp/window.el' --- lisp/window.el 2011-10-05 06:49:53 +0000 +++ lisp/window.el 2011-10-05 08:59:13 +0000 @@ -1058,6 +1058,32 @@ (dolist (walk-windows-window (window-list-1 nil minibuf all-frames)) (funcall proc walk-windows-window)))) +(defun window-point-1 (&optional window) + "Return value of WINDOW's point. +WINDOW can be any live window and defaults to the selected one. + +This function is like `window-point' with one exception: If +WINDOW is selected, it returns the value of `point' of WINDOW's +buffer regardless of whether that buffer is current or not." + (setq window (window-normalize-live-window window)) + (if (eq window (selected-window)) + (with-current-buffer (window-buffer window) + (point)) + (window-point window))) + +(defun set-window-point-1 (window pos) + "Set value of WINDOW's point to POS. +WINDOW can be any live window and defaults to the selected one. + +This function is like `set-window-point' with one exception: If +WINDOW is selected, it moves `point' of WINDOW's buffer to POS +regardless of whether that buffer is current or not." + (setq window (window-normalize-live-window window)) + (if (eq window (selected-window)) + (with-current-buffer (window-buffer window) + (goto-char pos)) + (set-window-point window pos))) + (defun window-in-direction-2 (window posn &optional horizontal) "Support function for `window-in-direction'." (if horizontal @@ -1087,7 +1113,7 @@ (last (+ first (if hor (window-total-width window) (window-total-height window)))) - (posn-cons (nth 6 (posn-at-point (window-point window) window))) + (posn-cons (nth 6 (posn-at-point (window-point-1 window) window))) ;; The column / row value of `posn-at-point' can be nil for the ;; mini-window, guard against that. (posn (if hor @@ -2492,7 +2518,7 @@ ;; Add an entry for buffer to WINDOW's previous buffers. (with-current-buffer buffer (let ((start (window-start window)) - (point (window-point window))) + (point (window-point-1 window))) (setq entry (cons buffer (if entry @@ -2534,10 +2560,7 @@ ;; Don't force window-start here (even if POINT is nil). (set-window-start window start t)) (when point - (if selected - (with-current-buffer buffer - (goto-char point)) - (set-window-point window point))))) + (set-window-point-1 window point)))) (defun switch-to-prev-buffer (&optional window bury-or-kill) "In WINDOW switch to previous buffer. @@ -3550,7 +3573,7 @@ ;; All buffer related things go in here - make the buffer ;; current when retrieving `point' and `mark'. (with-current-buffer (window-buffer window) - (let ((point (if selected (point) (window-point window))) + (let ((point (window-point-1 window)) (start (window-start window)) (mark (mark))) (window-list-no-nils @@ -3845,14 +3868,7 @@ (list 'other ;; A quadruple of WINDOW's buffer, start, point and height. (list (window-buffer window) (window-start window) - (if (eq window (selected-window)) - ;; When WINDOW is the selected window use its - ;; buffer's `point' instead of `window-point' - ;; (Bug#9626). - (with-current-buffer (window-buffer window) - (point)) - (window-point window)) - (window-total-size window)) + (window-point-1 window) (window-total-size window)) (selected-window) buffer)))) ((eq type 'window) ;; WINDOW has been created on an existing frame. ------------------------------------------------------------ revno: 106001 committer: martin rudalics branch nick: trunk timestamp: Wed 2011-10-05 08:49:53 +0200 message: New option frame-auto-hide-function replacing frame-auto-delete. * window.el (frame-auto-hide-function): New option replacing frame-auto-delete. Suggested by Stefan Monnier. (window--delete): Call frame-auto-hide-function instead of investigating frame-auto-delete. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-05 05:30:03 +0000 +++ lisp/ChangeLog 2011-10-05 06:49:53 +0000 @@ -1,3 +1,10 @@ +2011-10-05 Martin Rudalics + + * window.el (frame-auto-hide-function): New option replacing + frame-auto-delete. Suggested by Stefan Monnier. + (window--delete): Call frame-auto-hide-function instead of + investigating frame-auto-delete. + 2011-10-05 Stefan Monnier * emacs-lisp/edebug.el: Heed checkdoc recommendations. === modified file 'lisp/window.el' --- lisp/window.el 2011-10-04 15:28:25 +0000 +++ lisp/window.el 2011-10-05 06:49:53 +0000 @@ -2738,13 +2738,18 @@ (set-buffer-major-mode scratch) scratch))) -(defcustom frame-auto-delete nil - "Non-nil means automatically delete frames. -The default value nil means to iconify frames instead. Functions -affected by this variable are `quit-window' (when burying the -window's buffer) and `bury-buffer'." - :type 'boolean - :group 'windows) +(defcustom frame-auto-hide-function #'iconify-frame + "Function called to automatically hide frames. +The function is called with one argument - a frame. + +Functions affected by this option are those that bury a buffer +shown in a separate frame like `quit-window' and `bury-buffer'." + :type '(choice (const :tag "Iconify" iconify-frame) + (const :tag "Delete" delete-frame) + (const :tag "Do nothing" ignore) + function) + :group 'windows + :group 'frames) (defun window--delete (&optional window dedicated-only kill) "Delete WINDOW if possible. @@ -2760,9 +2765,8 @@ (cond ((eq deletable 'frame) (let ((frame (window-frame window))) - (if (or kill frame-auto-delete) - (delete-frame frame) - (iconify-frame frame))) + (when (functionp frame-auto-hide-function) + (funcall frame-auto-hide-function frame))) 'frame) (deletable (delete-window window) ------------------------------------------------------------ revno: 106000 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2011-10-05 01:30:03 -0400 message: * lisp/emacs-lisp/edebug.el: Heed checkdoc recommendations. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-05 05:28:55 +0000 +++ lisp/ChangeLog 2011-10-05 05:30:03 +0000 @@ -1,3 +1,7 @@ +2011-10-05 Stefan Monnier + + * emacs-lisp/edebug.el: Heed checkdoc recommendations. + 2011-10-05 Glenn Morris * progmodes/perl-mode.el (perl-electric-terminator): Doc fix. === modified file 'lisp/emacs-lisp/edebug.el' --- lisp/emacs-lisp/edebug.el 2011-08-21 17:43:31 +0000 +++ lisp/emacs-lisp/edebug.el 2011-10-05 05:30:03 +0000 @@ -1557,7 +1557,7 @@ ;; The first spec is handled and the remainder-handler handles the rest. (let ((edebug-matching-depth (if (> edebug-matching-depth edebug-max-depth) - (error "too deep - perhaps infinite loop in spec?") + (error "Too deep - perhaps infinite loop in spec?") (1+ edebug-matching-depth)))) (cond ((null specs) nil) @@ -3201,7 +3201,7 @@ "Modify the breakpoint for the form at point or after it. Set it if FLAG is non-nil, clear it otherwise. Then move to that point. If CONDITION or TEMPORARY are non-nil, add those attributes to -the breakpoint. " +the breakpoint." (let ((edebug-stop-point (edebug-find-stop-point))) (if edebug-stop-point (let* ((edebug-def-name (car edebug-stop-point)) @@ -3879,24 +3879,23 @@ \\{global-edebug-map} Options: -edebug-setup-hook -edebug-all-defs -edebug-all-forms -edebug-save-windows -edebug-save-displayed-buffer-points -edebug-initial-mode -edebug-trace -edebug-test-coverage -edebug-continue-kbd-macro -edebug-print-length -edebug-print-level -edebug-print-circle -edebug-on-error -edebug-on-quit -edebug-on-signal -edebug-unwrap-results -edebug-global-break-condition -" +`edebug-setup-hook' +`edebug-all-defs' +`edebug-all-forms' +`edebug-save-windows' +`edebug-save-displayed-buffer-points' +`edebug-initial-mode' +`edebug-trace' +`edebug-test-coverage' +`edebug-continue-kbd-macro' +`edebug-print-length' +`edebug-print-level' +`edebug-print-circle' +`edebug-on-error' +`edebug-on-quit' +`edebug-on-signal' +`edebug-unwrap-results' +`edebug-global-break-condition'" ;; If the user kills the buffer in which edebug is currently active, ;; exit to top level, because the edebug command loop can't usefully ;; continue running in such a case. ------------------------------------------------------------ revno: 105999 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-10-04 22:28:55 -0700 message: Small perl-mode fixes. * lisp/progmodes/perl-mode.el (perl-electric-terminator): Doc fix. (perl-calculate-indent): Suppress scan errors. (Bug#2205) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-05 03:37:21 +0000 +++ lisp/ChangeLog 2011-10-05 05:28:55 +0000 @@ -1,3 +1,8 @@ +2011-10-05 Glenn Morris + + * progmodes/perl-mode.el (perl-electric-terminator): Doc fix. + (perl-calculate-indent): Suppress scan errors. (Bug#2205) + 2011-10-05 Leo Liu * subr.el (read-char-choice): Fix argument to buffer-live-p which === modified file 'lisp/progmodes/perl-mode.el' --- lisp/progmodes/perl-mode.el 2011-09-28 02:19:56 +0000 +++ lisp/progmodes/perl-mode.el 2011-10-05 05:28:55 +0000 @@ -633,8 +633,8 @@ (defalias 'electric-perl-terminator 'perl-electric-terminator) (defun perl-electric-terminator (arg) - "Insert character and adjust indentation. -If at end-of-line, and not in a comment or a quote, correct the's indentation." + "Insert character and maybe adjust indentation. +If at end-of-line, and not in a comment or a quote, correct the indentation." (interactive "P") (let ((insertpos (point))) (and (not arg) ; decide whether to indent @@ -832,7 +832,11 @@ (save-excursion (beginning-of-line) (looking-at "\\s-+sub\\>")) - (> indent-point (save-excursion (forward-sexp 1) (point)))) + (> indent-point (save-excursion + (condition-case nil + (forward-sexp 1) + (scan-error nil)) + (point)))) (perl-beginning-of-function)) (while (< (point) indent-point) ;repeat until right sexp (setq state (parse-partial-sexp (point) indent-point 0)) ------------------------------------------------------------ revno: 105998 committer: Leo Liu branch nick: trunk timestamp: Wed 2011-10-05 11:37:21 +0800 message: Fix argument to buffer-live-p in read-char-choice diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-05 00:56:26 +0000 +++ lisp/ChangeLog 2011-10-05 03:37:21 +0000 @@ -1,3 +1,8 @@ +2011-10-05 Leo Liu + + * subr.el (read-char-choice): Fix argument to buffer-live-p which + works with buffer object. + 2011-10-05 Stefan Monnier * mpc.el (mpc-tool-bar-map): Add labels. === modified file 'lisp/subr.el' --- lisp/subr.el 2011-09-28 00:59:28 +0000 +++ lisp/subr.el 2011-10-05 03:37:21 +0000 @@ -2170,7 +2170,7 @@ (setq prompt (propertize prompt 'face 'minibuffer-prompt))) (setq char (let ((inhibit-quit inhibit-keyboard-quit)) (read-key prompt))) - (and show-help (buffer-live-p helpbuf) + (and show-help (buffer-live-p (get-buffer helpbuf)) (kill-buffer helpbuf)) (cond ((not (numberp char))) ------------------------------------------------------------ revno: 105997 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2011-10-04 20:56:26 -0400 message: * lisp/mpc.el (mpc-tool-bar-map): Add labels. diff: === modified file 'leim/ChangeLog' --- leim/ChangeLog 2011-09-27 02:15:28 +0000 +++ leim/ChangeLog 2011-10-05 00:56:26 +0000 @@ -44,7 +44,7 @@ * MISC-DIC/cangjie-table.b5, MISC-DIC/cangjie-table.cns, * MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: Likewise. - * Makefile.in (TIT_BIG5): Renamed from TIT-BIG5. + * Makefile.in (TIT_BIG5): Rename from TIT-BIG5. 2011-05-30 Oliver Scholz @@ -86,18 +86,18 @@ POSIX does not allow "-" in Makefile variable names. Reported by Bruno Haible in . - * Makefile.in (BUILT_EMACS): Renamed from BUILT-EMACS. - (TIT_GB): Renamed from TIT-GB. - (CHINESE_TIT): Renamed from CHINESE-TIT. - (NON_TIT_GB): Renamed from NON-TIT-GB. - (NON_TIT_BIG5): Renamed from NON-TIT-BIG5. - (CHINESE_NON_TIT): Renamed from CHINESE-NON-TIT. - (CHINESE_GB): Renamed from CHINESE-GB. - (CHINESE_BIG5): Renamed from CHINESE-BIG5. - (TIT_MISC): Renamed from TIT-MISC. - (NON_TIT_MISC): Renamed from NON-TIT-MISC. - (TIT_SOURCES): Renamed from TIT-SOURCES. - (MISC_SOURCES): Renamed from MISC-SOURCES. + * Makefile.in (BUILT_EMACS): Rename from BUILT-EMACS. + (TIT_GB): Rename from TIT-GB. + (CHINESE_TIT): Rename from CHINESE-TIT. + (NON_TIT_GB): Rename from NON-TIT-GB. + (NON_TIT_BIG5): Rename from NON-TIT-BIG5. + (CHINESE_NON_TIT): Rename from CHINESE-NON-TIT. + (CHINESE_GB): Rename from CHINESE-GB. + (CHINESE_BIG5): Rename from CHINESE-BIG5. + (TIT_MISC): Rename from TIT-MISC. + (NON_TIT_MISC): Rename from NON-TIT-MISC. + (TIT_SOURCES): Rename from TIT-SOURCES. + (MISC_SOURCES): Rename from MISC-SOURCES. 2011-01-08 Glenn Morris @@ -418,8 +418,8 @@ ("thai-kesmanee", "thai-pattachote"): Don't use UPDATE-TRANSLATION-FUNCTION. - * quail/indian.el (quail-indian-preceding-char-position): Delete - function. + * quail/indian.el (quail-indian-preceding-char-position): + Delete function. (quail-indian-update-preceding-char): Delete variable. (quail-indian-update-translation): Delete function. (quail-define-indian-trans-package): Don't call @@ -487,7 +487,7 @@ ("german-alt-postfix", "icelandic-alt-postfix") ("norwegian-alt-postfix", "scandinavian-alt-postfix") ("spanish-alt-postfix", "swedish-alt-postfix"): - Deleted; they were identical to the non-alt versions. + Delete; they were identical to the non-alt versions. 2007-12-07 Kenichi Handa @@ -637,7 +637,7 @@ 2005-11-03 Andreas Schwab - * Makefile.in (GZIP_PROG): Renamed from GZIP. + * Makefile.in (GZIP_PROG): Rename from GZIP. (install): Adjust. 2005-11-01 Romain Francoise @@ -1274,8 +1274,8 @@ 2001-04-23 Gerd Moellmann - * quail/latin-ltx.el: Add more translations. From - jsbien@mimuw.edu.pl (Janusz S. Bień). + * quail/latin-ltx.el: Add more translations. + From jsbien@mimuw.edu.pl (Janusz S. Bień). 2001-04-19 Eli Zaretskii @@ -1318,8 +1318,8 @@ 2001-04-02 Eli Zaretskii - * Makefile.in (KOREAN): Add ${srcdir}/quail/hanja3.elc. From - Kenichi Handa . + * Makefile.in (KOREAN): Add ${srcdir}/quail/hanja3.elc. + From Kenichi Handa . * Makefile.in (.NOTPARALLEL, .NO_PARALLEL): Add ${MISC-DIC}. @@ -1372,8 +1372,8 @@ 2001-03-16 Kenichi Handa - * quail/japanese.el (quail-japanese-transliteration-rules): New - variable. Use it to define these input methods: "japanese", + * quail/japanese.el (quail-japanese-transliteration-rules): + New variable. Use it to define these input methods: "japanese", "japanese-hiragana", "japanese-katakana". (quail-japanese-kana-state): Delete this variable. (quail-japanese-toggle-kana): Don't use quail-japanese-kana-state, @@ -1428,7 +1428,7 @@ 2001-01-28 Gerd Moellmann - * Makefile.in (extraclean): Added target so make doesn't die if + * Makefile.in (extraclean): Add target so make doesn't die if one runs "make extraclean" at the top level. 2001-01-06 Andrew Innes @@ -1478,7 +1478,7 @@ (NON-TIT-CNS, JAPANESE, KOREAN, THAI, VIETNAMESE, LAO, INDIAN) (TIBETAN, LATIN, SLAVIC, GREEK, RUSSIAN, MISC): Rename all .el files to .elc. - ($(TIT)): Adjusted for the above change. + ($(TIT)): Adjust for the above change. (clean mostlyclean): Likewise. (.el.elc): New target. @@ -1488,7 +1488,7 @@ (NON-TIT-CNS, JAPANESE, KOREAN, THAI, VIETNAMESE, LAO, INDIAN) (TIBETAN, LATIN, SLAVIC, GREEK, RUSSIAN, MISC): Rename all .el files to .elc. - ($(TIT)): Adjusted for the above change. + ($(TIT)): Adjust for the above change. (clean mostlyclean): Likewise. (.el.elc): New target. @@ -1552,7 +1552,7 @@ ("japanese-hankaku-kana", "japanese-hiragana") ("japanese-katakana"): Docstring modified. - * quail/czech.el ("czech-qwerty"): Changed to show keyboard layout + * quail/czech.el ("czech-qwerty"): Change to show keyboard layout on describe-input-method. ("czech-prog-1", "czech-prog-2", "czech-prog-3"): Likewise. @@ -1660,12 +1660,12 @@ 1999-09-19 Ken'ichi Handa - * quail/latin-alt.el ("turkish-latin-3-alt-postfix"): Renamed from + * quail/latin-alt.el ("turkish-latin-3-alt-postfix"): Rename from turkish-postfix. ("turkish-postfix"): New Turkish input method which inserts Latin-5 characters. - * quail/latin-alt.el ("turkish-latin-3-alt-postfix"): Renamed from + * quail/latin-alt.el ("turkish-latin-3-alt-postfix"): Rename from turkish-alt-postfix. ("turkish-alt-postfix"): New Turkish input method which inserts Latin-5 characters. @@ -1715,7 +1715,7 @@ 1998-12-15 Kenichi Handa * quail/devanagari.el (quail-devanagari-compose-characters): - Adjusted for the change of input method handling. + Adjust for the change of input method handling. (quail-devanagari-hindi-compose-characters): Likewise. 1998-10-15 Kenichi Handa @@ -1747,16 +1747,16 @@ 1998-09-25 Kenichi Handa * quail/japanese.el (quail-japanese-hankaku-update-translation): - Adjusted for the change of input method handling. + Adjust for the change of input method handling. 1998-09-11 Kenichi HANDA * quail/japanese.el (quail-japanese-katakana-update-translation): - Adjusted for the change of input method handling. + Adjust for the change of input method handling. 1998-08-31 Kenichi Handa - * quail/tibetan.el (quail-tibetan-input-wylie): Adjusted for the + * quail/tibetan.el (quail-tibetan-input-wylie): Adjust for the change of input method handling. (quail-tibetan-input-tibkey): Likewise. @@ -1780,7 +1780,7 @@ 1998-08-06 Kenichi Handa * quail/japanese.el (quail-japanese-use-double-n): New variable. - (quail-japanese-update-translation): Adjusted for the change of + (quail-japanese-update-translation): Adjust for the change of quail-update-translation. Now this function should return CONTROL-FLAG. (quail-japanese-toggle-kana): Update quail-conversion-str. @@ -1790,8 +1790,8 @@ 1998-07-24 Kenichi Handa - * quail/japanese.el (quail-japanese-kanji-kkc): Set - quail-translation to nil after calling kkc-region so that + * quail/japanese.el (quail-japanese-kanji-kkc): + Set quail-translation to nil after calling kkc-region so that translation mode is restarted correctly. 1998-07-21 Kenichi Handa @@ -1802,15 +1802,15 @@ 1998-07-19 Kenichi Handa - * quail/japanese.el (quail-japanese-update-translation): Handle - a key which should fix the current translation and start a new + * quail/japanese.el (quail-japanese-update-translation): + Handle a key which should fix the current translation and start a new translation correctly. - (quail-japanese-toggle-kana): Set quail-translating to nil. Don't - change point. + (quail-japanese-toggle-kana): Set quail-translating to nil. + Don't change point. 1998-07-15 Kenichi Handa - * quail/japanese.el (quail-japanese-kanji-kkc): Adjusted for the + * quail/japanese.el (quail-japanese-kanji-kkc): Adjust for the change of quail.el. (quail-japanese-switch-package): Likewise. @@ -1895,17 +1895,17 @@ * quail/symbol-ksc.el: Title string of the input method "korean-symbol" changed. Require 'korea-util. - (quail-hangul-switch-back): Deleted. + (quail-hangul-switch-back): Delete. * quail/hangul3.el: Require 'korea-util. - (quail-hangul-switch-to-symbol-ksc): Deleted. + (quail-hangul-switch-to-symbol-ksc): Delete. * quail/hanja.el: Require 'korea-util. Title string of the input method "korean-hanja" changed. - (quail-hanja-switch-to-symbol-ksc): Deleted. + (quail-hanja-switch-to-symbol-ksc): Delete. * quail/hangul.el: Require 'korea-util. - (quail-hangul-switch-to-symbol-ksc): Deleted. + (quail-hangul-switch-to-symbol-ksc): Delete. 1997-10-23 Kenichi Handa @@ -1951,18 +1951,18 @@ 1997-09-10 Kenichi Handa - * quail/ethiopic.el: Don't bind keys in quail-mode-map. The - function added to quail-mode-hook turn ethio-mode on only when + * quail/ethiopic.el: Don't bind keys in quail-mode-map. + The function added to quail-mode-hook turn ethio-mode on only when input method "ethiopic" is begin used. - (ethio-prefer-ascii-space): Moved to lisp/language/ethio-util.el. + (ethio-prefer-ascii-space): Move to lisp/language/ethio-util.el. (ethio-toggle-space): Likewise. (ethio-insert-space): Likewise. (ethio-insert-ethio-space): Likewise. (ethio-prefer-ascii-punctuation): Likewise. (ethio-toggle-punctuation): Likewise. (ethio-gemination): Likewise. - ("ethiopic"): Doc-string of this Quail package modified. Bind - function keys for TRANSLATION-KEYMAP to + ("ethiopic"): Doc-string of this Quail package modified. + Bind function keys for TRANSLATION-KEYMAP to quail-execute-non-quail-command. 1997-09-10 Richard Stallman @@ -1972,8 +1972,8 @@ 1997-09-03 Ken'ichi Handa - * Makefile.in (install): Do not copy leim-list.el twice. Copy - `skk' subdirectory too. + * Makefile.in (install): Do not copy leim-list.el twice. + Copy `skk' subdirectory too. 1997-09-03 Kenichi Handa @@ -2028,8 +2028,8 @@ 1997-08-23 Kenichi Handa - * quail/devanagari.el (quail-devanagari-compose-characters): Fix - previous change. + * quail/devanagari.el (quail-devanagari-compose-characters): + Fix previous change. (quail-devanagari-hindi-compose-characters): Fix previous change. * quail/japanese.el (quail-japanese-kkc-mode-exit): Fix previous @@ -2054,8 +2054,8 @@ (CHINESE-CNS): File name change: tsangchi-cns.el -> tsang-cns.el. (leim-list.el): Delete old files not contained in ${WORLD}. - * quail/japanese.el (quail-japanese-kkc-mode-exit): Run - input-method-after-insert-chunk-hook. + * quail/japanese.el (quail-japanese-kkc-mode-exit): + Run input-method-after-insert-chunk-hook. * quail/thai.el (thai-keyboard-mapping-alist): Some entry corrected. @@ -2075,17 +2075,17 @@ * quail/thai.el (thai-consonant-input): Typo fixed. - * quail/devanagari.el (quail-devanagari-compose-characters): Do - not call throw. + * quail/devanagari.el (quail-devanagari-compose-characters): + Do not call throw. (quail-devanagari-hindi-compose-characters): Likewise. - * quail/hangul.el (quail-hangul-switch-to-symbol-ksc): Call - activate-input-method instead of select-input-method. + * quail/hangul.el (quail-hangul-switch-to-symbol-ksc): + Call activate-input-method instead of select-input-method. * quail/hangul3.el (quail-hangul-switch-to-symbol-ksc): Likewise. - * quail/symbol-ksc.el (quail-hangul-switch-back): Likewise. Use - input-method-history instead of previous-input-method. + * quail/symbol-ksc.el (quail-hangul-switch-back): Likewise. + Use input-method-history instead of previous-input-method. 1997-08-16 Valery Alexeev === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-04 17:26:55 +0000 +++ lisp/ChangeLog 2011-10-05 00:56:26 +0000 @@ -1,3 +1,7 @@ +2011-10-05 Stefan Monnier + + * mpc.el (mpc-tool-bar-map): Add labels. + 2011-10-04 Glenn Morris * calendar/holidays.el (calendar-check-holidays): Doc fix. === modified file 'lisp/mpc.el' --- lisp/mpc.el 2011-09-14 21:20:24 +0000 +++ lisp/mpc.el 2011-10-05 00:56:26 +0000 @@ -1089,10 +1089,12 @@ (defvar mpc-tool-bar-map (let ((map (make-sparse-keymap))) (tool-bar-local-item "mpc/prev" 'mpc-prev 'prev map - :enable '(not (equal (cdr (assq 'state mpc-status)) "stop"))) + :enable '(not (equal (cdr (assq 'state mpc-status)) "stop")) + :label "Prev" :vert-only t) ;; FIXME: how can we bind it to the down-event? (tool-bar-local-item "mpc/rewind" 'mpc-rewind 'rewind map :enable '(not (equal (cdr (assq 'state mpc-status)) "stop")) + :label "Rew" :vert-only t :button '(:toggle . (and mpc--faster-toggle-timer (not mpc--faster-toggle-forward)))) ;; We could use a single toggle command for pause/play, with 2 different @@ -1100,20 +1102,26 @@ ;; to be a toggle-button, thus displayed depressed in one of the ;; two states :-( (tool-bar-local-item "mpc/pause" 'mpc-pause 'pause map + :label "Pause" :vert-only t :visible '(equal (cdr (assq 'state mpc-status)) "play") :help "Pause/play") (tool-bar-local-item "mpc/play" 'mpc-play 'play map + :label "Play" :vert-only t :visible '(not (equal (cdr (assq 'state mpc-status)) "play")) :help "Play/pause") ;; FIXME: how can we bind it to the down-event? (tool-bar-local-item "mpc/ffwd" 'mpc-ffwd 'ffwd map :enable '(not (equal (cdr (assq 'state mpc-status)) "stop")) + :label "Ffwd" :vert-only t :button '(:toggle . (and mpc--faster-toggle-timer mpc--faster-toggle-forward))) (tool-bar-local-item "mpc/next" 'mpc-next 'next map + :label "Next" :vert-only t :enable '(not (equal (cdr (assq 'state mpc-status)) "stop"))) - (tool-bar-local-item "mpc/stop" 'mpc-stop 'stop map) + (tool-bar-local-item "mpc/stop" 'mpc-stop 'stop map + :label "Stop" :vert-only t) (tool-bar-local-item "mpc/add" 'mpc-playlist-add 'add map + :label "Add" :vert-only t :help "Append to the playlist") map)) ------------------------------------------------------------ revno: 105996 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-10-04 13:26:55 -0400 message: * lisp/calendar/holidays.el (calendar-check-holidays): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-04 15:28:25 +0000 +++ lisp/ChangeLog 2011-10-04 17:26:55 +0000 @@ -1,3 +1,7 @@ +2011-10-04 Glenn Morris + + * calendar/holidays.el (calendar-check-holidays): Doc fix. + 2011-10-04 Martin Rudalics * window.el (window--delete): New function. === modified file 'lisp/calendar/holidays.el' --- lisp/calendar/holidays.el 2011-04-17 02:11:49 +0000 +++ lisp/calendar/holidays.el 2011-10-04 17:26:55 +0000 @@ -632,8 +632,9 @@ ;;;###diary-autoload (defun calendar-check-holidays (date) "Check the list of holidays for any that occur on DATE. -The value returned is a list of strings of relevant holiday descriptions. -The holidays are those in the list `calendar-holidays'." +DATE is a list (month day year). This function considers the +holidays from the list `calendar-holidays', and returns a list of +strings describing those holidays that apply on DATE." (let ((displayed-month (calendar-extract-month date)) (displayed-year (calendar-extract-year date)) holiday-list) ------------------------------------------------------------ revno: 105995 committer: martin rudalics branch nick: trunk timestamp: Tue 2011-10-04 17:28:25 +0200 message: Make frame iconification/deletion optional when burying buffers. * window.el (window--delete): New function. (frame-auto-delete): Resuscitate option. (bury-buffer, replace-buffer-in-windows) (quit-window): Rewrite using window--delete. (display-buffer-pop-up-frame, display-buffer-pop-up-window): Pass display-buffer-mark-dedicated to window--display-buffer-2 (Bug#9639). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-03 16:49:56 +0000 +++ lisp/ChangeLog 2011-10-04 15:28:25 +0000 @@ -1,3 +1,13 @@ +2011-10-04 Martin Rudalics + + * window.el (window--delete): New function. + (frame-auto-delete): Resuscitate option. + (bury-buffer, replace-buffer-in-windows) + (quit-window): Rewrite using window--delete. + (display-buffer-pop-up-frame, display-buffer-pop-up-window): + Pass display-buffer-mark-dedicated to window--display-buffer-2 + (Bug#9639). + 2011-10-03 Stefan Monnier * pcmpl-unix.el (pcomplete/scp): Don't assume pcomplete-all-entries === modified file 'lisp/window.el' --- lisp/window.el 2011-09-29 09:20:45 +0000 +++ lisp/window.el 2011-10-04 15:28:25 +0000 @@ -2738,6 +2738,36 @@ (set-buffer-major-mode scratch) scratch))) +(defcustom frame-auto-delete nil + "Non-nil means automatically delete frames. +The default value nil means to iconify frames instead. Functions +affected by this variable are `quit-window' (when burying the +window's buffer) and `bury-buffer'." + :type 'boolean + :group 'windows) + +(defun window--delete (&optional window dedicated-only kill) + "Delete WINDOW if possible. +WINDOW must be a live window and defaults to the selected one. +Optional argument DEDICATED-ONLY non-nil means to delete WINDOW +only if it's dedicated to its buffer. Optional argument KILL +means the buffer shown in window will be killed. Return non-nil +if WINDOW gets deleted." + (setq window (window-normalize-live-window window)) + (unless (and dedicated-only (not (window-dedicated-p window))) + (let* ((buffer (window-buffer window)) + (deletable (window-deletable-p window))) + (cond + ((eq deletable 'frame) + (let ((frame (window-frame window))) + (if (or kill frame-auto-delete) + (delete-frame frame) + (iconify-frame frame))) + 'frame) + (deletable + (delete-window window) + t))))) + (defun bury-buffer (&optional buffer-or-name) "Put BUFFER-OR-NAME at the end of the list of all buffers. There it is the least likely candidate for `other-buffer' to @@ -2758,14 +2788,11 @@ ;; is shown in the selected window. (cond ((or buffer-or-name (not (eq buffer (window-buffer))))) - ((not (window-dedicated-p)) - (switch-to-prev-buffer nil 'bury)) - ((and (frame-root-window-p (selected-window)) - ;; Don't iconify if it's the only frame. - (not (eq (next-frame nil 0) (selected-frame)))) - (iconify-frame (window-frame (selected-window)))) - ((eq (window-deletable-p) t) - (delete-window))) + ((window--delete nil t)) + (t + ;; Switch to another buffer in window. + (set-window-dedicated-p nil nil) + (switch-to-prev-buffer nil 'kill))) ;; Always return nil. nil)) @@ -2840,30 +2867,21 @@ BUFFER-OR-NAME may be a buffer or the name of an existing buffer and defaults to the current buffer. -When a window showing BUFFER-OR-NAME is either dedicated, or the -window has no previous buffer, that window is deleted. If that -window is the only window on its frame, the frame is deleted too -when there are other frames left. If there are no other frames -left, some other buffer is displayed in that window. +When a window showing BUFFER-OR-NAME is dedicated, that window is +deleted. If that window is the only window on its frame, the +frame is deleted too when there are other frames left. If there +are no other frames left, some other buffer is displayed in that +window. This function removes the buffer denoted by BUFFER-OR-NAME from all window-local buffer lists." (let ((buffer (window-normalize-buffer buffer-or-name))) (dolist (window (window-list-1 nil nil t)) (if (eq (window-buffer window) buffer) - (let ((deletable (and (window-dedicated-p window) - (window-deletable-p window)))) - (cond - ((eq deletable 'frame) - ;; Delete frame. - (delete-frame (window-frame window))) - (deletable - ;; Delete window. - (delete-window window)) - (t - ;; Switch to another buffer in window. - (set-window-dedicated-p window nil) - (switch-to-prev-buffer window 'kill)))) + (unless (window--delete window t t) + ;; Switch to another buffer in window. + (set-window-dedicated-p window nil) + (switch-to-prev-buffer window 'kill)) ;; Unrecord BUFFER in WINDOW. (unrecord-window-buffer window buffer))))) @@ -2893,20 +2911,10 @@ quad resize) (cond ((and (not prev-buffer) - (eq (nth 1 quit-restore) 'frame) - (eq (window-deletable-p window) 'frame) - (eq (nth 3 quit-restore) buffer)) - ;; WINDOW's frame can be deleted. - (delete-frame (window-frame window)) - ;; If the previously selected window is still alive, select it. - (when (window-live-p (nth 2 quit-restore)) - (select-window (nth 2 quit-restore)))) - ((and (not prev-buffer) - (eq (nth 1 quit-restore) 'window) - (eq (window-deletable-p window) t) - (eq (nth 3 quit-restore) buffer)) - ;; WINDOW can be deleted. - (delete-window window) + (memq (nth 1 quit-restore) '(window frame)) + (eq (nth 3 quit-restore) buffer) + ;; Delete WINDOW if possible. + (window--delete window nil kill)) ;; If the previously selected window is still alive, select it. (when (window-live-p (nth 2 quit-restore)) (select-window (nth 2 quit-restore)))) @@ -4748,7 +4756,7 @@ (setq frame (funcall fun)) (setq window (frame-selected-window frame))) (display-buffer-record-window 'frame window buffer) - (window--display-buffer-2 buffer window) + (window--display-buffer-2 buffer window display-buffer-mark-dedicated) ;; Reset list of WINDOW's previous buffers to nil. (set-window-prev-buffers window nil) window))) @@ -4774,7 +4782,7 @@ (window--try-to-split-window (get-lru-window frame t))))) (display-buffer-record-window 'window window buffer) - (window--display-buffer-2 buffer window) + (window--display-buffer-2 buffer window display-buffer-mark-dedicated) ;; Reset list of WINDOW's previous buffers to nil. (set-window-prev-buffers window nil) window))) ------------------------------------------------------------ revno: 105994 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-10-03 19:27:29 -0400 message: Tweak debbugs entry in gnus-bug-group-download-format-alist again. * lisp/gnus/gnus-group.el (gnus-bug-group-download-format-alist): Once again get the "maintainer" version of debbugs.gnu.org reports. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-02 22:03:55 +0000 +++ lisp/gnus/ChangeLog 2011-10-03 23:27:29 +0000 @@ -1,3 +1,8 @@ +2011-10-03 Glenn Morris + + * gnus-group.el (gnus-bug-group-download-format-alist): Once again get + the "maintainer" version of debbugs.gnu.org reports. + 2011-10-02 Lars Magne Ingebrigtsen * shr.el (shr-tag-img): Add a space at the end of an ALT image text to === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2011-09-12 01:00:11 +0000 +++ lisp/gnus/gnus-group.el 2011-10-03 23:27:29 +0000 @@ -2429,7 +2429,7 @@ (gnus-read-ephemeral-gmane-group group start range))) (defcustom gnus-bug-group-download-format-alist - '((emacs . "http://debbugs.gnu.org/%s;mboxstat=yes") + '((emacs . "http://debbugs.gnu.org/%s;mboxmaint=yes;mboxstat=yes") (debian . "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s&mbox=yes;mboxmaint=yes")) "Alist of symbols for bug trackers and the corresponding URL format string.