Now on revision 106271. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 106271 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2011-11-02 08:56:48 -0400 message: * lisp/window.el (switch-to-buffer): Use `force-same-window' interactively. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-02 09:39:18 +0000 +++ lisp/ChangeLog 2011-11-02 12:56:48 +0000 @@ -1,9 +1,12 @@ +2011-11-02 Stefan Monnier + + * window.el (switch-to-buffer): Use `force-same-window' interactively. + 2011-11-02 Martin Rudalics * window.el (quit-window): Call unrecord-window-buffer after showing another buffer in the window. (Bug#9937) - (bury-buffer): Call switch-to-prev-buffer with second argument - 'bury. + (bury-buffer): Call switch-to-prev-buffer with second argument `bury'. 2011-11-02 Juanma Barranquero @@ -38,8 +41,8 @@ 2011-10-30 Martin Rudalics * window.el (window-iso-combination-p, window-iso-combined-p) - (window-iso-combinations): Remove "iso-" infix. Suggested by - Chong Yidong. + (window-iso-combinations): Remove "iso-" infix. + Suggested by Chong Yidong. (window-min-size-1, window-size-fixed-1, window-min-delta-1) (window-max-delta-1, window-resize, window--resize-siblings) (window--resize-this-window, adjust-window-trailing-edge) @@ -139,8 +142,7 @@ Prevent "class foo : bar" being spuriously recognized as a label. * progmodes/cc-cmds.el (c-narrow-to-most-enclosing-decl-block): - Add parameter `inclusive' (to include enclosing braces in the - region). + Add parameter `inclusive' (to include enclosing braces in the region). (c-widen-to-enclosing-decl-scope): New function. (c-while-widening-to-decl-block): New macro. (c-beginning-of-defun, c-end-of-defun): Change algorithm to keep going @@ -161,7 +163,7 @@ * progmodes/cc-defs.el: Update "virtual semicolon" comments. * progmodes/cc-engine.el (c-crosses-statement-barrier-p): - Recoded to scan one line at at time rather than having \n and \r + Recode to scan one line at at time rather than having \n and \r explicitly in c-stmt-delim-chars (for some modes, e.g. AWK). (c-forward-label): Amend for virtual semicolons. @@ -171,8 +173,8 @@ of the new C macros. * progmodes/cc-langs.el (c-at-vsemi-p-fn): - (c-vsemi-status-unknown-p-fn): move to earlier in the file. - (c-opt-cpp-symbol, c-line-comment-start-regexp): New language variables. + (c-vsemi-status-unknown-p-fn): Move to earlier in the file. + (c-opt-cpp-symbol, c-line-comment-start-regexp): New language vars. (c-opt-cpp-macro-define): Make into a full language variable. (c-stmt-delim-chars, c-stmt-delim-chars-with-comma): Special value for AWK Mode (including \n, \r) removed, no longer needed. @@ -232,7 +234,7 @@ 2011-10-26 Juanma Barranquero - * term/w32-win.el (w32-default-color-map): Declare obsolete. (Bug#9785) + * term/w32-win.el (w32-default-color-map): Declare obsolete (Bug#9785). 2011-10-26 Michael Albinus @@ -280,7 +282,8 @@ 2011-10-24 Stefan Monnier - * progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding. + * progmodes/octave-inf.el (inferior-octave-mode-map): + Fix C-c C-h binding. * progmodes/octave-mod.el (octave-help): Remove. 2011-10-23 Michael Albinus === modified file 'lisp/window.el' --- lisp/window.el 2011-11-02 09:39:18 +0000 +++ lisp/window.el 2011-11-02 12:56:48 +0000 @@ -5024,7 +5024,7 @@ Return the buffer switched to." (interactive - (list (read-buffer-to-switch "Switch to buffer: ") nil nil)) + (list (read-buffer-to-switch "Switch to buffer: ") nil 'force-same-window)) (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name))) (if (null force-same-window) (pop-to-buffer buffer display-buffer--same-window-action norecord) ------------------------------------------------------------ revno: 106270 committer: martin rudalics branch nick: trunk timestamp: Wed 2011-11-02 10:39:18 +0100 message: In quit-window call unrecord-window-buffer later. (Bug#9937) * window.el (quit-window): Call unrecord-window-buffer after showing another buffer in the window. (Bug#9937) (bury-buffer): Call switch-to-prev-buffer with second argument 'bury. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-02 02:05:53 +0000 +++ lisp/ChangeLog 2011-11-02 09:39:18 +0000 @@ -1,3 +1,10 @@ +2011-11-02 Martin Rudalics + + * window.el (quit-window): Call unrecord-window-buffer after + showing another buffer in the window. (Bug#9937) + (bury-buffer): Call switch-to-prev-buffer with second argument + 'bury. + 2011-11-02 Juanma Barranquero * vc/vc-bzr.el (vc-bzr-state, vc-bzr-after-dir-status): === modified file 'lisp/window.el' --- lisp/window.el 2011-10-30 08:29:56 +0000 +++ lisp/window.el 2011-11-02 09:39:18 +0000 @@ -2852,7 +2852,7 @@ (t ;; Switch to another buffer in window. (set-window-dedicated-p nil nil) - (switch-to-prev-buffer nil 'kill))) + (switch-to-prev-buffer nil 'bury))) ;; Always return nil. nil)) @@ -2985,7 +2985,6 @@ (setq resize (with-current-buffer buffer (and temp-buffer-resize-mode (/= (nth 3 quad) (window-total-size window))))) - (unrecord-window-buffer window buffer) (set-window-dedicated-p window nil) (when resize ;; Try to resize WINDOW to its old height but don't signal an @@ -2993,9 +2992,12 @@ (condition-case nil (window-resize window (- (nth 3 quad) (window-total-size window))) (error nil))) - ;; Restore WINDOW's previous buffer, window start and point. + ;; Restore WINDOW's previous buffer, start and point position. (set-window-buffer-start-and-point window (nth 0 quad) (nth 1 quad) (nth 2 quad)) + ;; Unrecord WINDOW's buffer here (Bug#9937) to make sure it's not + ;; re-recorded by `set-window-buffer'. + (unrecord-window-buffer window buffer) ;; Reset the quit-restore parameter. (set-window-parameter window 'quit-restore nil) ;; Select old window. ------------------------------------------------------------ revno: 106269 author: Teodor Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-11-02 07:28:14 +0000 message: Rename `gnus-bound-and-true-dumber-p' to `gnus-bound-and-true-p'. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-31 22:55:39 +0000 +++ lisp/gnus/ChangeLog 2011-11-02 07:28:14 +0000 @@ -1,3 +1,10 @@ +2011-11-01 Teodor Zlatanov + + * gnus-util.el (gnus-bound-and-true-p): Remove. + (gnus-bound-and-true-dumber-p): Rename to `gnus-bound-and-true-p'. + * nnir.el: Use it. + * nnmairix.el: Use it. + 2011-10-31 Teodor Zlatanov * gnus-util.el (gnus-bound-and-true-dumber-p): Define new, slower, dumb === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2011-10-31 22:55:39 +0000 +++ lisp/gnus/gnus-util.el 2011-11-02 07:28:14 +0000 @@ -1986,15 +1986,8 @@ (gnus-macroexpand-all expanded environment))) form)))) -(eval-when-compile - ;; This is unnecessary in the compiled version as it is a macro. - (if (fboundp 'bound-and-true-p) - (defalias 'gnus-bound-and-true-p 'bound-and-true-p) - (defmacro gnus-bound-and-true-p (var) - "Return the value of symbol VAR if it is bound, else nil." - `(and (boundp (quote ,var)) ,var)))) - -(defun gnus-bound-and-true-dumber-p (sym) +;; simple check, can be a macro but this way, although slow, it's really clear +(defun gnus-bound-and-true-p (sym) (and (boundp sym) (symbol-value sym))) (provide 'gnus-util) === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2011-10-31 22:55:39 +0000 +++ lisp/gnus/nnir.el 2011-11-02 07:28:14 +0000 @@ -1739,7 +1739,7 @@ (when (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnir) (setq gnus-summary-line-format (or nnir-summary-line-format gnus-summary-line-format)) - (when (gnus-bound-and-true-dumber-p 'gnus-registry-enabled) + (when (gnus-bound-and-true-p 'gnus-registry-enabled) (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t) (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t) (remove-hook 'gnus-summary-article-expire-hook 'gnus-registry-action t) === modified file 'lisp/gnus/nnmairix.el' --- lisp/gnus/nnmairix.el 2011-10-31 22:55:39 +0000 +++ lisp/gnus/nnmairix.el 2011-11-02 07:28:14 +0000 @@ -1635,7 +1635,7 @@ (defun nnmairix-determine-original-group-from-registry (mid) "Try to determinale original group for message-id MID from the registry." - (when (gnus-bound-and-true-dumber-p 'gnus-registry-enabled) + (when (gnus-bound-and-true-p 'gnus-registry-enabled) (unless (string-match "^<" mid) (set mid (concat "<" mid))) (unless (string-match ">$" mid) ------------------------------------------------------------ revno: 106268 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-11-02 03:05:53 +0100 message: Fix typos. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-02 01:58:59 +0000 +++ lisp/ChangeLog 2011-11-02 02:05:53 +0000 @@ -25,8 +25,8 @@ * net/newst-treeview.el: Remove "Time-stamp". (newsticker--group-manage-orphan-feeds): Do not call newsticker--treeview-tree-update. - (newsticker-treeview-update, newsticker-treeview): Call - newsticker--treeview-tree-update if necessary. + (newsticker-treeview-update, newsticker-treeview): + Call newsticker--treeview-tree-update if necessary. 2011-10-30 Martin Rudalics @@ -39,8 +39,7 @@ (split-window, balance-windows-1) (shrink-window-if-larger-than-buffer): * calendar/calendar.el (calendar-generate-window): - * help.el (resize-temp-buffer-window): Adjust callers - accordingly. + * help.el (resize-temp-buffer-window): Adjust callers accordingly. 2011-10-30 Stefan Monnier @@ -115,7 +114,7 @@ 2011-10-28 Alan Mackenzie - * progmodes/cc-defs.el (c-version). -> 5.32.2. + * progmodes/cc-defs.el (c-version): -> 5.32.2. 2011-10-28 Alan Mackenzie @@ -345,7 +344,7 @@ 2011-10-20 Glenn Morris - * vc/vc.el (vc-next-action): Handle removed directories. (Bug#9781) + * vc/vc.el (vc-next-action): Handle removed directories. (Bug#9781) 2011-10-20 Christoph Scholtes === modified file 'lisp/vc/vc-dir.el' --- lisp/vc/vc-dir.el 2011-09-18 20:43:20 +0000 +++ lisp/vc/vc-dir.el 2011-11-02 02:05:53 +0000 @@ -992,8 +992,8 @@ (let ((def-dir default-directory) (backend vc-dir-backend)) (vc-set-mode-line-busy-indicator) - ;; Call the `dir-status-file' backend function. - ;; `dir-status-file' is supposed to be asynchronous. + ;; Call the `dir-status-files' backend function. + ;; `dir-status-files' is supposed to be asynchronous. ;; It should compute the results, and then call the function ;; passed as an argument in order to update the vc-dir buffer ;; with the results. ------------------------------------------------------------ revno: 106267 fixes bug(s): http://debbugs.gnu.org/9935 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-11-02 02:58:59 +0100 message: Fix bug#9935 * lisp/vc/vc-bzr.el: Accept status with more than 9 shelves. Reported by Colin D Bennett . diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-01 19:22:57 +0000 +++ lisp/ChangeLog 2011-11-02 01:58:59 +0000 @@ -1,3 +1,9 @@ +2011-11-02 Juanma Barranquero + + * vc/vc-bzr.el (vc-bzr-state, vc-bzr-after-dir-status): + Accept status with more than 9 shelves. (Bug#9935) + Reported by Colin D Bennett . + 2011-11-01 Martin Rudalics * help.el (with-help-window): Don't reference === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2011-10-19 16:42:20 +0000 +++ lisp/vc/vc-bzr.el 2011-11-02 01:58:59 +0000 @@ -444,7 +444,7 @@ (let ((warnings (cdr result))) (when warnings ;; bzr 2.3.0 returns info about shelves, which is not really a warning - (when (string-match "[1-9]+ shel\\(f\\|ves\\) exists?\\..*?\n" warnings) + (when (string-match "[0-9]+ shel\\(f\\|ves\\) exists?\\..*?\n" warnings) (setq warnings (replace-match "" nil nil warnings))) (unless (string= warnings "") (message "Warnings in `bzr' output: %s" warnings)))) @@ -891,7 +891,7 @@ (goto-char (point-min)) (while (not (eobp)) ;; Bzr 2.3.0 added this if there are shelves. (Bug#8170) - (unless (looking-at "[1-9]+ shel\\(f\\|ves\\) exists?\\.") + (unless (looking-at "[0-9]+ shel\\(f\\|ves\\) exists?\\.") (setq status-str (buffer-substring-no-properties (point) (+ (point) 3))) (setq translated (cdr (assoc status-str translation))) ------------------------------------------------------------ revno: 106266 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-11-01 15:22:57 -0400 message: ChangeLog fixes. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-10-31 22:26:45 +0000 +++ doc/misc/ChangeLog 2011-11-01 19:22:57 +0000 @@ -10,9 +10,8 @@ "Macros with ;". (Macros with ;): New page. - * progmodes/cc-mode.texi (Movement Commands): Document - `c-defun-tactic'. Document the new handling of nested scopes for - movement by defuns. + * cc-mode.texi (Movement Commands): Document `c-defun-tactic'. + Document the new handling of nested scopes for movement by defuns. 2011-10-23 Michael Albinus === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-01 16:21:41 +0000 +++ lisp/ChangeLog 2011-11-01 19:22:57 +0000 @@ -297,7 +297,7 @@ Fix bug #9560, sporadic wrong indentation; improve instrumentation of c-parse-state. - * cc-engine.el (c-append-lower-brace-pair-to-state-cache): + * progmodes/cc-engine.el (c-append-lower-brace-pair-to-state-cache): correct faulty logical expression. (c-parse-state-state, c-record-parse-state-state): (c-replay-parse-state-state): New defvar/defuns. ------------------------------------------------------------ revno: 106265 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2011-11-01 21:19:07 +0200 message: Rename locals to match their nature. src/xdisp.c (mouse_face_from_buffer_pos, note_mouse_highlight): Rename cover_string to disp_string. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-01 18:57:03 +0000 +++ src/ChangeLog 2011-11-01 19:19:07 +0000 @@ -3,6 +3,8 @@ * xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment. Don't stop backward scan on the continuation glyph, even though its CHARPOS is positive. + (mouse_face_from_buffer_pos, note_mouse_highlight): Rename + cover_string to disp_string. 2011-11-01 Martin Rudalics === modified file 'src/xdisp.c' --- src/xdisp.c 2011-11-01 18:57:03 +0000 +++ src/xdisp.c 2011-11-01 19:19:07 +0000 @@ -25808,7 +25808,7 @@ for the overlay or run of text properties specifying the mouse face. BEFORE_STRING and AFTER_STRING, if non-nil, are a before-string and after-string that must also be highlighted. - COVER_STRING, if non-nil, is a display string that may cover some + DISP_STRING, if non-nil, is a display string that may cover some or all of the highlighted text. */ static void @@ -25819,7 +25819,7 @@ EMACS_INT end_charpos, Lisp_Object before_string, Lisp_Object after_string, - Lisp_Object cover_string) + Lisp_Object disp_string) { struct window *w = XWINDOW (window); struct glyph_row *first = MATRIX_FIRST_TEXT_ROW (w->current_matrix); @@ -25828,7 +25828,7 @@ EMACS_INT ignore, pos; int x; - xassert (NILP (cover_string) || STRINGP (cover_string)); + xassert (NILP (disp_string) || STRINGP (disp_string)); xassert (NILP (before_string) || STRINGP (before_string)); xassert (NILP (after_string) || STRINGP (after_string)); @@ -25838,7 +25838,7 @@ r1 = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); /* If the before-string or display-string contains newlines, rows_from_pos_range skips to its last row. Move back. */ - if (!NILP (before_string) || !NILP (cover_string)) + if (!NILP (before_string) || !NILP (disp_string)) { struct glyph_row *prev; while ((prev = r1 - 1, prev >= first) @@ -25850,7 +25850,7 @@ while (--glyph >= beg && INTEGERP (glyph->object)); if (glyph < beg || !(EQ (glyph->object, before_string) - || EQ (glyph->object, cover_string))) + || EQ (glyph->object, disp_string))) break; r1 = prev; } @@ -25893,7 +25893,7 @@ hlinfo->mouse_face_end_row = MATRIX_ROW_VPOS (r2, w->current_matrix); /* For a bidi-reordered row, the positions of BEFORE_STRING, - AFTER_STRING, COVER_STRING, START_CHARPOS, and END_CHARPOS + AFTER_STRING, DISP_STRING, START_CHARPOS, and END_CHARPOS could be anywhere in the row and in any order. The strategy below is to find the leftmost and the rightmost glyph that belongs to either of these 3 strings, or whose position is @@ -25919,11 +25919,11 @@ x += glyph->pixel_width; /* Scan the glyph row, looking for BEFORE_STRING, AFTER_STRING, - or COVER_STRING, and the first glyph from buffer whose + or DISP_STRING, and the first glyph from buffer whose position is between START_CHARPOS and END_CHARPOS. */ for (; glyph < end && !INTEGERP (glyph->object) - && !EQ (glyph->object, cover_string) + && !EQ (glyph->object, disp_string) && !(BUFFERP (glyph->object) && (glyph->charpos >= start_charpos && glyph->charpos < end_charpos)); @@ -25970,11 +25970,11 @@ ; /* Scan the glyph row, looking for BEFORE_STRING, AFTER_STRING, - or COVER_STRING, and the first glyph from buffer whose + or DISP_STRING, and the first glyph from buffer whose position is between START_CHARPOS and END_CHARPOS. */ for (; glyph > end && !INTEGERP (glyph->object) - && !EQ (glyph->object, cover_string) + && !EQ (glyph->object, disp_string) && !(BUFFERP (glyph->object) && (glyph->charpos >= start_charpos && glyph->charpos < end_charpos)); @@ -26034,12 +26034,12 @@ --end; /* Scan the rest of the glyph row from the end, looking for the first glyph that comes from BEFORE_STRING, AFTER_STRING, or - COVER_STRING, or whose position is between START_CHARPOS + DISP_STRING, or whose position is between START_CHARPOS and END_CHARPOS */ for (--end; end > glyph && !INTEGERP (end->object) - && !EQ (end->object, cover_string) + && !EQ (end->object, disp_string) && !(BUFFERP (end->object) && (end->charpos >= start_charpos && end->charpos < end_charpos)); @@ -26083,12 +26083,12 @@ } /* Scan the rest of the glyph row from the end, looking for the first glyph that comes from BEFORE_STRING, AFTER_STRING, or - COVER_STRING, or whose position is between START_CHARPOS + DISP_STRING, or whose position is between START_CHARPOS and END_CHARPOS */ for ( ; end < glyph && !INTEGERP (end->object) - && !EQ (end->object, cover_string) + && !EQ (end->object, disp_string) && !(BUFFERP (end->object) && (end->charpos >= start_charpos && end->charpos < end_charpos)); @@ -27083,7 +27083,7 @@ /* The mouse-highlighting, if any, comes from an overlay or text property in the buffer. */ Lisp_Object buffer IF_LINT (= Qnil); - Lisp_Object cover_string IF_LINT (= Qnil); + Lisp_Object disp_string IF_LINT (= Qnil); if (STRINGP (object)) { @@ -27097,13 +27097,13 @@ mouse_face = get_char_property_and_overlay (make_number (pos), Qmouse_face, w->buffer, &overlay); buffer = w->buffer; - cover_string = object; + disp_string = object; } } else { buffer = object; - cover_string = Qnil; + disp_string = Qnil; } if (!NILP (mouse_face)) @@ -27155,7 +27155,7 @@ XFASTINT (before), XFASTINT (after), before_string, after_string, - cover_string); + disp_string); cursor = No_Cursor; } } ------------------------------------------------------------ revno: 106264 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2011-11-01 20:57:03 +0200 message: Fix mouse highlight in continued lines on a TTY. src/xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment. Don't stop backward scan on the continuation glyph, even though its CHARPOS is positive. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-01 16:21:41 +0000 +++ src/ChangeLog 2011-11-01 18:57:03 +0000 @@ -1,3 +1,9 @@ +2011-11-01 Eli Zaretskii + + * xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment. + Don't stop backward scan on the continuation glyph, even though + its CHARPOS is positive. + 2011-11-01 Martin Rudalics * window.c (temp_output_buffer_show): Don't use === modified file 'src/xdisp.c' --- src/xdisp.c 2011-10-30 18:07:48 +0000 +++ src/xdisp.c 2011-11-01 18:57:03 +0000 @@ -25875,10 +25875,10 @@ r2 = next; } /* The rest of the display engine assumes that mouse_face_beg_row is - either above below mouse_face_end_row or identical to it. But - with bidi-reordered continued lines, the row for START_CHARPOS - could be below the row for END_CHARPOS. If so, swap the rows and - store them in correct order. */ + either above mouse_face_end_row or identical to it. But with + bidi-reordered continued lines, the row for START_CHARPOS could + be below the row for END_CHARPOS. If so, swap the rows and store + them in correct order. */ if (r1->y > r2->y) { struct glyph_row *tem = r2; @@ -26030,8 +26030,7 @@ row, and also blanks and stretch glyphs inserted by extend_face_to_end_of_line. */ while (end > glyph - && INTEGERP ((end - 1)->object) - && (end - 1)->charpos <= 0) + && INTEGERP ((end - 1)->object)) --end; /* Scan the rest of the glyph row from the end, looking for the first glyph that comes from BEFORE_STRING, AFTER_STRING, or @@ -26077,8 +26076,7 @@ x = r2->x; end++; while (end < glyph - && INTEGERP (end->object) - && end->charpos <= 0) + && INTEGERP (end->object)) { x += end->pixel_width; ++end; ------------------------------------------------------------ revno: 106263 committer: martin rudalics branch nick: trunk timestamp: Tue 2011-11-01 17:21:41 +0100 message: Remove unused variable temp-buffer-show-specifiers. * window.c (temp_output_buffer_show): Don't use Vtemp_buffer_show_specifiers. (Vtemp_buffer_show_specifiers): Remove unused variable. * help.el (with-help-window): Don't reference temp-buffer-show-specifiers in doc-string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-31 10:53:16 +0000 +++ lisp/ChangeLog 2011-11-01 16:21:41 +0000 @@ -1,3 +1,8 @@ +2011-11-01 Martin Rudalics + + * help.el (with-help-window): Don't reference + temp-buffer-show-specifiers in doc-string. + 2011-10-31 Andreas Schwab * subr.el (keymap--menu-item-with-binding): Ignore item if not a === modified file 'lisp/help.el' --- lisp/help.el 2011-10-30 08:29:56 +0000 +++ lisp/help.el 2011-11-01 16:21:41 +0000 @@ -1125,10 +1125,7 @@ (defmacro with-help-window (buffer-name &rest body) "Display buffer with name BUFFER-NAME in a help window evaluating BODY. Select help window if the actual value of the user option -`help-window-select' says so. Return last value in BODY. - -You can specify where and how to show the buffer by binding the -variable `temp-buffer-show-specifiers' to an appropriate value." +`help-window-select' says so. Return last value in BODY." (declare (indent 1) (debug t)) `(progn ;; Make `help-window-point-marker' point nowhere. The only place === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-30 18:07:48 +0000 +++ src/ChangeLog 2011-11-01 16:21:41 +0000 @@ -1,3 +1,9 @@ +2011-11-01 Martin Rudalics + + * window.c (temp_output_buffer_show): Don't use + Vtemp_buffer_show_specifiers. + (Vtemp_buffer_show_specifiers): Remove unused variable. + 2011-10-30 Eli Zaretskii * xdisp.c (try_cursor_movement): Make sure ROW isn't decremented === modified file 'src/window.c' --- src/window.c 2011-10-28 14:34:06 +0000 +++ src/window.c 2011-11-01 16:21:41 +0000 @@ -3185,10 +3185,7 @@ call1 (Vtemp_buffer_show_function, buf); else { - window = display_buffer (buf, Vtemp_buffer_show_specifiers, Qnil); - /* Reset Vtemp_buffer_show_specifiers immediately so it won't - affect subsequent calls. */ - Vtemp_buffer_show_specifiers = Qnil; + window = display_buffer (buf, Qnil, Qnil); if (!EQ (XWINDOW (window)->frame, selected_frame)) Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window))); @@ -6460,16 +6457,6 @@ the buffer; `temp-buffer-show-hook' is not run unless this function runs it. */); Vtemp_buffer_show_function = Qnil; - DEFVAR_LISP ("temp-buffer-show-specifiers", Vtemp_buffer_show_specifiers, - doc: /* Buffer display specifiers used by `with-output-to-temp-buffer'. -These specifiers are passed by `with-output-to-temp-buffer' as second -argument to `display-buffer'. Applications should only let-bind this -around a call to `with-output-to-temp-buffer'. - -For a description of buffer display specifiers see the variable -`display-buffer-alist'. */); - Vtemp_buffer_show_specifiers = Qnil; - DEFVAR_LISP ("minibuffer-scroll-window", Vminibuf_scroll_window, doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll. */); Vminibuf_scroll_window = Qnil; ------------------------------------------------------------ revno: 106262 author: Ted Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-10-31 22:55:39 +0000 message: gnus-bound-and-true-dumper-p to fix XEmacs build. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-31 22:11:23 +0000 +++ lisp/gnus/ChangeLog 2011-10-31 22:55:39 +0000 @@ -1,5 +1,11 @@ 2011-10-31 Teodor Zlatanov + * gnus-util.el (gnus-bound-and-true-dumber-p): Define new, slower, dumb + function because `gnus-bound-and-true-p' doesn't work well in XEmacs + for reasons unknown. + * nnir.el: Use it. + * nnmairix.el: Use it. + * nnregistry.el: Remove unnecessary `gnus-registry-enabled' defvar. * nnir.el: Ditto. * nnmairix.el: Ditto. === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2011-10-18 14:10:52 +0000 +++ lisp/gnus/gnus-util.el 2011-10-31 22:55:39 +0000 @@ -1994,6 +1994,9 @@ "Return the value of symbol VAR if it is bound, else nil." `(and (boundp (quote ,var)) ,var)))) +(defun gnus-bound-and-true-dumber-p (sym) + (and (boundp sym) (symbol-value sym))) + (provide 'gnus-util) ;;; gnus-util.el ends here === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2011-10-31 22:11:23 +0000 +++ lisp/gnus/nnir.el 2011-10-31 22:55:39 +0000 @@ -1739,7 +1739,7 @@ (when (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnir) (setq gnus-summary-line-format (or nnir-summary-line-format gnus-summary-line-format)) - (when (gnus-bound-and-true-p gnus-registry-enabled) + (when (gnus-bound-and-true-dumber-p 'gnus-registry-enabled) (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t) (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t) (remove-hook 'gnus-summary-article-expire-hook 'gnus-registry-action t) === modified file 'lisp/gnus/nnmairix.el' --- lisp/gnus/nnmairix.el 2011-10-31 22:11:23 +0000 +++ lisp/gnus/nnmairix.el 2011-10-31 22:55:39 +0000 @@ -1635,7 +1635,7 @@ (defun nnmairix-determine-original-group-from-registry (mid) "Try to determinale original group for message-id MID from the registry." - (when (gnus-bound-and-true-p gnus-registry-enabled) + (when (gnus-bound-and-true-dumber-p 'gnus-registry-enabled) (unless (string-match "^<" mid) (set mid (concat "<" mid))) (unless (string-match ">$" mid) ------------------------------------------------------------ revno: 106261 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-10-31 22:26:45 +0000 message: gnus.texi (Other Gnus Versions): Remove. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-10-28 16:16:02 +0000 +++ doc/misc/ChangeLog 2011-10-31 22:26:45 +0000 @@ -1,3 +1,7 @@ +2011-10-31 Katsumi Yamaoka + + * gnus.texi (Other Gnus Versions): Remove. + 2011-10-28 Alan Mackenzie * cc-mode.texi (Indentation Commands): Mention "macros with semicolons". === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-10-06 22:11:15 +0000 +++ doc/misc/gnus.texi 2011-10-31 22:26:45 +0000 @@ -891,7 +891,6 @@ History * Gnus Versions:: What Gnus versions have been released. -* Other Gnus Versions:: Other Gnus versions that also have been released. * Why?:: What's the point of Gnus? * Compatibility:: Just how compatible is Gnus with @sc{gnus}? * Conformity:: Gnus tries to conform to all standards. @@ -26382,7 +26381,6 @@ @menu * Gnus Versions:: What Gnus versions have been released. -* Other Gnus Versions:: Other Gnus versions that also have been released. * Why?:: What's the point of Gnus? * Compatibility:: Just how compatible is Gnus with @sc{gnus}? * Conformity:: Gnus tries to conform to all standards. @@ -26438,22 +26436,6 @@ Find a proper released version of Gnus and snuggle up to that instead. -@node Other Gnus Versions -@subsection Other Gnus Versions -@cindex Semi-gnus - -In addition to the versions of Gnus which have had their releases -coordinated by Lars, one major development has been Semi-gnus from -Japan. It's based on a library called @acronym{SEMI}, which provides -@acronym{MIME} capabilities. - -These Gnusae are based mainly on Gnus 5.6 and Pterodactyl Gnus. -Collectively, they are called ``Semi-gnus'', and different strains are -called T-gnus, ET-gnus, Nana-gnus and Chaos. These provide powerful -@acronym{MIME} and multilingualization things, especially important for -Japanese users. - - @node Why? @subsection Why? ------------------------------------------------------------ revno: 106260 author: Ted Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-10-31 22:11:23 +0000 message: gnus-registry-enabled fixes to give default value. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-26 17:27:51 +0000 +++ lisp/gnus/ChangeLog 2011-10-31 22:11:23 +0000 @@ -1,3 +1,11 @@ +2011-10-31 Teodor Zlatanov + + * nnregistry.el: Remove unnecessary `gnus-registry-enabled' defvar. + * nnir.el: Ditto. + * nnmairix.el: Ditto. + + * gnus-registry.el (gnus-registry-enabled): Default to nil. + 2011-10-26 Stefan Monnier * message.el (message-completion-function): Make sure @@ -25,7 +33,7 @@ * nnir.el (gnus-registry-enabled): Defvar to keep the compiler happy. * nnmairix.el (gnus-registry-enabled): Ditto. -2011-10-17 Dave Abrahams +2011-10-17 Dave Abrahams (tiny change) * gnus-registry.el (gnus-registry-enabled): Add new variable. (Bug#9691) (gnus-registry-install-shortcuts): Set `gnus-registry-install' to 'ask === modified file 'lisp/gnus/gnus-registry.el' --- lisp/gnus/gnus-registry.el 2011-10-17 22:51:37 +0000 +++ lisp/gnus/gnus-registry.el 2011-10-31 22:11:23 +0000 @@ -164,7 +164,7 @@ (const :tag "Always Install" t) (const :tag "Ask Me" ask))) -(defvar gnus-registry-enabled) +(defvar gnus-registry-enabled nil) (defvar gnus-summary-misc-menu) ;; Avoid byte compiler warning. === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2011-10-18 14:10:52 +0000 +++ lisp/gnus/nnir.el 2011-10-31 22:11:23 +0000 @@ -292,9 +292,6 @@ (autoload 'nnimap-make-thread-query "nnimap") (autoload 'gnus-registry-action "gnus-registry")) -;; Suppress byte-compiler warning `reference to free variable' -(defvar gnus-registry-enabled) - (nnoo-declare nnir) (nnoo-define-basics nnir) === modified file 'lisp/gnus/nnmairix.el' --- lisp/gnus/nnmairix.el 2011-10-18 14:10:52 +0000 +++ lisp/gnus/nnmairix.el 2011-10-31 22:11:23 +0000 @@ -605,9 +605,6 @@ ;; Silence byte-compiler. (autoload 'gnus-registry-get-id-key "gnus-registry") -;; Suppress byte-compiler warning `reference to free variable' -(defvar gnus-registry-enabled) - (deffoo nnmairix-request-set-mark (group actions &optional server) (when server (nnmairix-open-server server)) === modified file 'lisp/gnus/nnregistry.el' --- lisp/gnus/nnregistry.el 2011-10-17 22:51:37 +0000 +++ lisp/gnus/nnregistry.el 2011-10-31 22:11:23 +0000 @@ -36,9 +36,6 @@ (nnoo-declare nnregistry) -;; Suppress byte-compiler warning `reference to free variable' -(defvar gnus-registry-enabled) - (deffoo nnregistry-server-opened (server) gnus-registry-enabled) ------------------------------------------------------------ revno: 106259 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2011-10-31 19:49:10 +0200 message: Fix previous commit. config.bat: Use config.in and Makefile.in from src/ and lib/, if they exist there, else from autogen/. make-dist: Don't add `autogen'. diff: === modified file 'ChangeLog' --- ChangeLog 2011-10-31 17:37:39 +0000 +++ ChangeLog 2011-10-31 17:49:10 +0000 @@ -1,9 +1,9 @@ 2011-10-31 Eli Zaretskii - * make-dist (tempdir): Create `autogen'. - (msdos): Add depfiles.bat and inttypes.h. - (autogen): Put README, config.in, and Makefile.in ionto the - distribution, they are needed for the MS-DOS build. + * config.bat: Use config.in and Makefile.in from src/ and lib/, if + they exist there, else from autogen/. + + * make-dist (msdos): Add depfiles.bat and inttypes.h. 2011-10-25 Nali Toja (tiny change) === modified file 'config.bat' --- config.bat 2011-09-29 12:08:36 +0000 +++ config.bat 2011-10-31 17:49:10 +0000 @@ -156,9 +156,11 @@ rem Create "config.h" rm -f config.h2 config.tmp -sed -e '' ../autogen/config.in > config.tmp +if exist config.in sed -e '' config.in > config.tmp +if exist ..\autogen\config.in sed -e '' ../autogen/config.in > config.tmp if "%X11%" == "" goto src4 -sed -f ../msdos/sed2x.inp < ..\autogen\config.in > config.tmp +if exist config.in sed -f ../msdos/sed2x.inp < config.in > config.tmp +if exist ..\autogen\config.in sed -f ../msdos/sed2x.inp < ..\autogen\config.in > config.tmp :src4 sed -f ../msdos/sed2v2.inp config.h2 Rem See if DECL_ALIGN can be supported with this GCC @@ -290,7 +292,8 @@ If Exist sys_stat.in.h update sys_stat.in.h sys_stat.in-h If Exist time.in.h update time.in.h time.in-h If Exist unistd.in.h update unistd.in.h unistd.in-h -sed -f ../msdos/sedlibcf.inp < ..\autogen\Makefile.in > makefile.tmp +If Exist Makefile.in sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp +If Exist ..\autogen\Makefile.in sed -f ../msdos/sedlibcf.inp < ..\autogen\Makefile.in > makefile.tmp sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile rm -f makefile.tmp Rem Create .Po files for new files in lib/ === modified file 'make-dist' --- make-dist 2011-10-31 17:37:39 +0000 +++ make-dist 2011-10-31 17:49:10 +0000 @@ -297,7 +297,7 @@ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ `find etc lisp admin -type d` \ doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \ - info m4 msdos autogen \ + info m4 msdos \ nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \ nextstep/Cocoa/Emacs.base/Contents \ nextstep/Cocoa/Emacs.base/Contents/Resources \ @@ -422,10 +422,6 @@ ln depfiles.bat inttypes.h ../${tempdir}/msdos ln is_exec.c sigaction.c mainmake.v2 sed*.inp ../${tempdir}/msdos) -echo "Making links to \`autogen'" -(cd autogen - ln README config.in Makefile.in ../${tempdir}/autogen) - echo "Making links to \`nextstep'" (cd nextstep ln ChangeLog README INSTALL ../${tempdir}/nextstep) ------------------------------------------------------------ revno: 106258 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2011-10-31 19:37:39 +0200 message: Fix distribution tarball for the MS-DOS build. make-dist (tempdir): Create `autogen'. (msdos): Add depfiles.bat and inttypes.h. (autogen): Put README, config.in, and Makefile.in ionto the distribution, they are needed for the MS-DOS build. msdos/sed3v2.inp (insrcdir): Comment out definition. $(insrcdir): Edit into MS-DOS existence test. diff: === modified file 'ChangeLog' --- ChangeLog 2011-10-25 16:41:26 +0000 +++ ChangeLog 2011-10-31 17:37:39 +0000 @@ -1,3 +1,10 @@ +2011-10-31 Eli Zaretskii + + * make-dist (tempdir): Create `autogen'. + (msdos): Add depfiles.bat and inttypes.h. + (autogen): Put README, config.in, and Makefile.in ionto the + distribution, they are needed for the MS-DOS build. + 2011-10-25 Nali Toja (tiny change) * configure.in (HAVE_GNU_MAKE): Respect MAKE env-var. (Bug#9868) === modified file 'make-dist' --- make-dist 2011-10-18 06:19:28 +0000 +++ make-dist 2011-10-31 17:37:39 +0000 @@ -297,7 +297,7 @@ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ `find etc lisp admin -type d` \ doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \ - info m4 msdos \ + info m4 msdos autogen \ nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \ nextstep/Cocoa/Emacs.base/Contents \ nextstep/Cocoa/Emacs.base/Contents/Resources \ @@ -419,8 +419,13 @@ echo "Making links to \`msdos'" (cd msdos ln ChangeLog INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos + ln depfiles.bat inttypes.h ../${tempdir}/msdos ln is_exec.c sigaction.c mainmake.v2 sed*.inp ../${tempdir}/msdos) +echo "Making links to \`autogen'" +(cd autogen + ln README config.in Makefile.in ../${tempdir}/autogen) + echo "Making links to \`nextstep'" (cd nextstep ln ChangeLog README INSTALL ../${tempdir}/nextstep) === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2011-09-29 12:00:18 +0000 +++ msdos/ChangeLog 2011-10-31 17:37:39 +0000 @@ -1,3 +1,8 @@ +2011-10-31 Eli Zaretskii + + * sed3v2.inp (insrcdir): Comment out definition. + $(insrcdir): Edit into MS-DOS existence test. + 2011-09-29 Eli Zaretskii * mainmake.v2 (boot): Condition the value on the existence of === modified file 'msdos/sed3v2.inp' --- msdos/sed3v2.inp 2011-02-19 17:54:18 +0000 +++ msdos/sed3v2.inp 2011-10-31 17:37:39 +0000 @@ -49,4 +49,6 @@ /^UTILITIES *=/,/^$/{ s/movemail[^ ]* *// } +/^insrcdir=/s/^.*$/\#&/ +/^ *\$(insrcdir) ||/s,\$(insrcdir) ||,command.com /c if not exist $<, ------------------------------------------------------------ revno: 106257 committer: Andreas Schwab branch nick: emacs timestamp: Mon 2011-10-31 11:53:16 +0100 message: * lisp/subr.el (keymap--menu-item-with-binding): Ignore item if not a menu-item. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-31 00:37:09 +0000 +++ lisp/ChangeLog 2011-10-31 10:53:16 +0000 @@ -1,3 +1,8 @@ +2011-10-31 Andreas Schwab + + * subr.el (keymap--menu-item-with-binding): Ignore item if not a + menu-item. + 2011-10-30 Vinicius Jose Latorre * whitespace.el: New version 13.2.2. === modified file 'lisp/subr.el' --- lisp/subr.el 2011-10-29 08:41:39 +0000 +++ lisp/subr.el 2011-10-31 10:53:16 +0000 @@ -624,6 +624,7 @@ (defun keymap--menu-item-with-binding (item binding) "Build a menu-item like ITEM but with its binding changed to BINDING." (cond + ((not (consp item)) binding) ;Not a menu-item. ((eq 'menu-item (car item)) (setq item (copy-sequence item)) (let ((tail (nthcdr 2 item)))