Now on revision 106283. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 106283 fixes bug(s): http://debbugs.gnu.org/9949 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2011-11-04 12:09:41 +0200 message: Fix documentation per bug #9949. src/window.c (Fwindow_body_size): Mention in the doc string that the return value is in frame's canonical units. lisp/window.el (window-body-height, window-body-width): Mention in the doc string that the return values are in frame's canonical units. doc/lispref/windows.texi (Window Sizes): Mention in the doc string that the return values of `window-body-height' and `window-body-width' are in frame's canonical units. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-10-30 08:29:56 +0000 +++ doc/lispref/ChangeLog 2011-11-04 10:09:41 +0000 @@ -1,3 +1,9 @@ +2011-11-04 Eli Zaretskii + + * windows.texi (Window Sizes): Mention in the doc string that the + return values of `window-body-height' and `window-body-width' are + in frame's canonical units. (Bug#9949) + 2011-10-30 Martin Rudalics * windows.texi (Windows and Frames): Remove "iso-" infix from === modified file 'doc/lispref/windows.texi' --- doc/lispref/windows.texi 2011-10-30 08:29:56 +0000 +++ doc/lispref/windows.texi 2011-11-04 10:09:41 +0000 @@ -563,8 +563,18 @@ @cindex body size of a window @cindex window body size -The following functions retrieve height and width of the body of a live -window: +@cindex canonical units of window/frame size +The following functions retrieve height and width of the body of a +live window. Note that the values these functions return are measured +in @dfn{canonical units}, i.e.@: for the default frame's face. If the +window shows some characters with non-default face, e.g., if the font +of some characters is larger or smaller than the default font, the +values returned by these functions will not match the actual number of +lines or characters per line shown in the window. To get the actual +number of columns and lines, move to the last character in the line +(e.g., with @code{end-of-visual-line}) or to the last line of the +window (e.g., with @code{window-end}), and use @code{posn-at-point} to +find the line or column there. @defun window-body-size &optional window horizontal This function returns the number of lines of @var{window}'s text area. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-03 22:10:02 +0000 +++ lisp/ChangeLog 2011-11-04 10:09:41 +0000 @@ -1,3 +1,9 @@ +2011-11-04 Eli Zaretskii + + * window.el (window-body-height, window-body-width): Mention in + the doc string that the return values are in frame's canonical + units. (Bug#9949) + 2011-11-03 Alan Mackenzie * progmodes/cc-langs.el (c-nonlabel-token-2-key): New variable for === modified file 'lisp/window.el' --- lisp/window.el 2011-11-02 12:56:48 +0000 +++ lisp/window.el 2011-11-04 10:09:41 +0000 @@ -972,7 +972,14 @@ line, if any. If a line at the bottom of the window is only partially visible, that line is included in the return value. If you do not want to include a partially visible bottom line in the -return value, use `window-text-height' instead." +return value, use `window-text-height' instead. + +Note that the return value is measured in canonical units, i.e. for +the default frame's face. If the window shows some characters with +non-default face, e.g., if the font of some characters is larger or +smaller than the default font, the value returned by this function +will not match the actual number of lines shown in the window. To +get the actual number of lines, use `posn-at-point'." (window-body-size window)) (defsubst window-body-width (&optional window) @@ -982,7 +989,14 @@ The return value does not include any vertical dividers or scroll bars owned by WINDOW. On a window-system the return value does not include the number of columns used for WINDOW's fringes or -display margins either." +display margins either. + +Note that the return value is measured in canonical units, i.e. for +the default frame's face. If the window shows some characters with +non-default face, e.g., if the font of some characters is larger or +smaller than the default font, the value returned by this function +will not match the actual number of characters per line shown in the +window. To get the actual number of columns, use `posn-at-point'." (window-body-size window t)) ;; Eventually we should make `window-height' obsolete. === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-03 22:11:40 +0000 +++ src/ChangeLog 2011-11-04 10:09:41 +0000 @@ -1,3 +1,8 @@ +2011-11-04 Eli Zaretskii + + * window.c (Fwindow_body_size): Mention in the doc string that the + return value is in frame's canonical units. (Bug#9949) + 2011-11-03 Eli Zaretskii * xdisp.c (note_mouse_highlight): Initialize `area'. (Bug#9947) === modified file 'src/window.c' --- src/window.c 2011-11-01 16:21:41 +0000 +++ src/window.c 2011-11-04 10:09:41 +0000 @@ -653,16 +653,25 @@ } DEFUN ("window-body-size", Fwindow_body_size, Swindow_body_size, 0, 2, 0, - doc: /* Return the number of lines of WINDOW's body. -WINDOW must be a live window and defaults to the selected one. The -return value does not include WINDOW's mode line and header line, if -any. - -Optional argument HORIZONTAL non-nil means return the number of columns -of WINDOW's body. In this case, the return value does not include any -vertical dividers or scroll bars owned by WINDOW. On a window-system -the return value does not include the number of columns used for -WINDOW's fringes or display margins either. */) + doc: /* Return the number of lines or columns of WINDOW's body. +WINDOW must be a live window and defaults to the selected one. + +If the optional argument HORIZONTAL is omitted or nil, the function +returns the number of WINDOW's lines, excluding the mode line and +header line, if any. + +If HORIZONTAL is non-nil, the function returns the number of columns +excluding any vertical dividers or scroll bars owned by WINDOW. On a +window-system the return value also excludes the number of columns +used for WINDOW's fringes or display margins. + +Note that the return value is measured in canonical units, i.e. for +the default frame's face. If the window shows some characters with +non-default face, e.g., if the font of some characters is larger or +smaller than the default font, the value returned by this function +will not match the actual number of lines or characters per line +shown in the window. To get the actual number of columns and lines, +use `posn-at-point'. */) (Lisp_Object window, Lisp_Object horizontal) { struct window *w = decode_any_window (window); ------------------------------------------------------------ revno: 106282 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-11-03 23:28:52 +0000 message: gnus-sum.el (gnus-articles-to-read): Change wording in prompt to be slightly clearer. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-03 22:16:08 +0000 +++ lisp/gnus/ChangeLog 2011-11-03 23:28:52 +0000 @@ -1,5 +1,10 @@ 2011-11-03 Lars Magne Ingebrigtsen + * gnus-sum.el (gnus-articles-to-read): Change wording in prompt to be + slightly clearer. + +2011-11-03 Lars Magne Ingebrigtsen + * message.el (message-send-and-exit): Document `arg'. 2011-11-03 Stefan Monnier === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-09-24 23:09:56 +0000 +++ lisp/gnus/gnus-sum.el 2011-11-03 23:28:52 +0000 @@ -5859,15 +5859,15 @@ (read-string (if only-read-p (format - "How many articles from %s (available %d, default %d): " + "How many articles from %s (available %d, default %d): " + (gnus-group-decoded-name + (gnus-group-real-name gnus-newsgroup-name)) + number default) + (format + "How many articles from %s (%d default): " (gnus-group-decoded-name (gnus-group-real-name gnus-newsgroup-name)) - number default) - (format - "How many articles from %s (%d available): " - (gnus-group-decoded-name - (gnus-group-real-name gnus-newsgroup-name)) - default)) + default)) nil nil (number-to-string default)))) ------------------------------------------------------------ revno: 106281 [merge] committer: Alan Mackenzie branch nick: trunk timestamp: Thu 2011-11-03 22:14:11 +0000 message: Add c-nonlabel-token-2-key to cc-langs.el. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-02 12:56:48 +0000 +++ lisp/ChangeLog 2011-11-03 22:10:02 +0000 @@ -1,3 +1,8 @@ +2011-11-03 Alan Mackenzie + + * progmodes/cc-langs.el (c-nonlabel-token-2-key): New variable for + change in cc-engine.el. + 2011-11-02 Stefan Monnier * window.el (switch-to-buffer): Use `force-same-window' interactively. @@ -136,7 +141,6 @@ * progmodes/cc-langs.el (c-defun-tactic): Move this variable to cc-vars.el. - (c-nonlabel-token-2-key): New variable for change in cc-engine.el. * progmodes/cc-engine.el (c-beginning-of-statement-1): Prevent "class foo : bar" being spuriously recognized as a label. === modified file 'lisp/progmodes/cc-langs.el' --- lisp/progmodes/cc-langs.el 2011-10-27 20:34:23 +0000 +++ lisp/progmodes/cc-langs.el 2011-11-03 21:55:15 +0000 @@ -3012,6 +3012,14 @@ c++ (concat "\\s\(\\|" (c-lang-const c-nonlabel-token-key))) (c-lang-defvar c-nonlabel-token-key (c-lang-const c-nonlabel-token-key)) +(c-lang-defconst c-nonlabel-token-2-key + "Regexp matching things that can't occur two symbols before a colon in +a label construct. This catches C++'s inheritance construct \"class foo +: bar\". Only used if `c-recognize-colon-labels' is set." + t "\\<\\>" ; matches nothing + c++ (c-make-keywords-re t '("class"))) +(c-lang-defvar c-nonlabel-token-2-key (c-lang-const c-nonlabel-token-2-key)) + (c-lang-defconst c-opt-extra-label-key "Optional regexp matching labels. Normally, labels are detected according to `c-nonlabel-token-key', ------------------------------------------------------------ revno: 106280 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-11-03 22:16:08 +0000 message: message.el (message-send-and-exit): Document `arg'. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-03 19:28:45 +0000 +++ lisp/gnus/ChangeLog 2011-11-03 22:16:08 +0000 @@ -1,3 +1,7 @@ +2011-11-03 Lars Magne Ingebrigtsen + + * message.el (message-send-and-exit): Document `arg'. + 2011-11-03 Stefan Monnier * nnimap.el (nnimap-open-connection-1): Use tcp-keealive if possible. === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-10-26 17:27:51 +0000 +++ lisp/gnus/message.el 2011-11-03 22:16:08 +0000 @@ -4022,7 +4022,9 @@ ;;; (defun message-send-and-exit (&optional arg) - "Send message like `message-send', then, if no errors, exit from mail buffer." + "Send message like `message-send', then, if no errors, exit from mail buffer. +The usage of ARG is defined by the instance that called Message. +It should typically alter the sending method in some way or other." (interactive "P") (let ((buf (current-buffer)) (actions message-exit-actions)) ------------------------------------------------------------ revno: 106279 fixes bug(s): http://debbugs.gnu.org/9947 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2011-11-04 00:11:40 +0200 message: Fix bug #9947 with referencing uninitialized variable. src/xdisp.c (note_mouse_highlight): Initialize `area'. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-03 21:56:32 +0000 +++ src/ChangeLog 2011-11-03 22:11:40 +0000 @@ -1,5 +1,7 @@ 2011-11-03 Eli Zaretskii + * xdisp.c (note_mouse_highlight): Initialize `area'. (Bug#9947) + * w32fns.c (unwind_create_frame): If needed, free the glyph matrices of the partially constructed frame. (Bug#9943) * xfns.c (unwind_create_frame): Likewise. === modified file 'src/xdisp.c' --- src/xdisp.c 2011-11-01 19:19:07 +0000 +++ src/xdisp.c 2011-11-03 22:11:40 +0000 @@ -26892,7 +26892,7 @@ && XFASTINT (w->last_modified) == BUF_MODIFF (b) && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b)) { - int hpos, vpos, dx, dy, area; + int hpos, vpos, dx, dy, area = LAST_AREA; EMACS_INT pos; struct glyph *glyph; Lisp_Object object; ------------------------------------------------------------ revno: 106278 fixes bug(s): http://debbugs.gnu.org/9943 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-11-03 23:56:32 +0200 message: Fix bug #9943 on X. src/xfns.c (unwind_create_frame): If needed, free the glyph matrices of the partially constructed frame. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-03 19:06:42 +0000 +++ src/ChangeLog 2011-11-03 21:56:32 +0000 @@ -2,6 +2,7 @@ * w32fns.c (unwind_create_frame): If needed, free the glyph matrices of the partially constructed frame. (Bug#9943) + * xfns.c (unwind_create_frame): Likewise. 2011-11-01 Eli Zaretskii === modified file 'src/xfns.c' --- src/xfns.c 2011-09-18 20:01:37 +0000 +++ src/xfns.c 2011-11-03 21:56:32 +0000 @@ -2936,6 +2936,7 @@ #endif x_free_frame_resources (f); + free_glyphs (f); #if GLYPH_DEBUG /* Check that reference counts are indeed correct. */ ------------------------------------------------------------ revno: 106277 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Thu 2011-11-03 22:53:59 +0100 message: (url-cookie-expired-p): Protect against zero-length cookie expiry dates. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2011-10-20 00:26:14 +0000 +++ lisp/url/ChangeLog 2011-11-03 21:53:59 +0000 @@ -1,3 +1,8 @@ +2011-11-03 Lars Magne Ingebrigtsen + + * url-cookie.el (url-cookie-expired-p): Protect against + zero-length cookie expiry dates. + 2011-10-19 Chong Yidong * url-handlers.el (url-handler-mode): Doc fix. === modified file 'lisp/url/url-cookie.el' --- lisp/url/url-cookie.el 2011-05-29 02:45:03 +0000 +++ lisp/url/url-cookie.el 2011-11-03 21:53:59 +0000 @@ -156,7 +156,8 @@ (defun url-cookie-expired-p (cookie) "Return non-nil if COOKIE is expired." (let ((exp (url-cookie-expires cookie))) - (and exp (> (float-time) (float-time (date-to-time exp)))))) + (and (> (length exp) 0) + (> (float-time) (float-time (date-to-time exp)))))) (defun url-cookie-retrieve (host &optional localpart secure) "Retrieve all cookies for a specified HOST and LOCALPART." ------------------------------------------------------------ revno: 106276 committer: David Engster branch nick: trunk timestamp: Thu 2011-11-03 21:03:45 +0100 message: * srecode.el: * srecode/texi.el: * srecode/template.el: * srecode/java.el: * srecode/insert.el: * srecode/document.el: * srecode/dictionary.el: * srecode/compile.el: * semantic/wisent/java-tags.el: * semantic/texi.el: * semantic/sort.el: * semantic/lex-spp.el: * semantic/idle.el: * semantic/html.el: * semantic/db-typecache.el: * semantic/analyze/complete.el: * ede/generic.el: * ede/custom.el: * ede/cpp-root.el: * ede/base.el: Fix filenames in comments and headers. * semantic/db-find.el: * srecode/insert.el (srecode-insert-include-lookup): * ede/proj-comp.el (ede-compilation-program): Fix it's -> its in comments and docstrings. * semantic/ctxt.el (semantic-end-of-context-default): * semantic/find.el (semantic-find-tags-by-scope-protection): * semantic/java.el (semantic-documentation-for-tag): Fix typos in docstrings. * semantic/db.el (semanticdb-table, semanticdb-abstract-cache) (semanticdb-abstract-db-cache): * semantic/decorate/include.el (semantic-decoration-unknown-include-describe): Fix filenames in docstring. * semantic/ede-grammar.el (semantic-ede-grammar-compiler-wisent): (semantic-ede-grammar-compiler-bovine): Fix requires that are added to the grammar-make-script. diff: === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2011-10-23 03:38:23 +0000 +++ lisp/cedet/ChangeLog 2011-11-03 20:03:45 +0000 @@ -1,3 +1,46 @@ +2011-11-03 David Engster + + * srecode.el: + * srecode/texi.el: + * srecode/template.el: + * srecode/java.el: + * srecode/insert.el: + * srecode/document.el: + * srecode/dictionary.el: + * srecode/compile.el: + * semantic/wisent/java-tags.el: + * semantic/texi.el: + * semantic/sort.el: + * semantic/lex-spp.el: + * semantic/idle.el: + * semantic/html.el: + * semantic/db-typecache.el: + * semantic/analyze/complete.el: + * ede/generic.el: + * ede/custom.el: + * ede/cpp-root.el: + * ede/base.el: Fix filenames in comments and headers. + + * semantic/db-find.el: + * srecode/insert.el (srecode-insert-include-lookup): + * ede/proj-comp.el (ede-compilation-program): Fix it's -> its in + comments and docstrings. + + * semantic/ctxt.el (semantic-end-of-context-default): + * semantic/find.el (semantic-find-tags-by-scope-protection): + * semantic/java.el (semantic-documentation-for-tag): Fix typos in + docstrings. + + * semantic/db.el (semanticdb-table, semanticdb-abstract-cache) + (semanticdb-abstract-db-cache): + * semantic/decorate/include.el + (semantic-decoration-unknown-include-describe): Fix filenames in + docstring. + + * semantic/ede-grammar.el (semantic-ede-grammar-compiler-wisent): + (semantic-ede-grammar-compiler-bovine): Fix requires that are + added to the grammar-make-script. + 2011-10-23 Chong Yidong * ede.el (ede-maybe-checkout): Function deleted; === modified file 'lisp/cedet/ede/base.el' --- lisp/cedet/ede/base.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/ede/base.el 2011-11-03 20:03:45 +0000 @@ -413,7 +413,7 @@ (defmethod ede-subproject-p ((proj ede-project)) "Return non-nil if PROJ is a sub project." ;; @TODO - Use this in more places, and also pay attention to - ;; metasubproject in ede-proj.el + ;; metasubproject in ede/proj.el (ede-parent-project proj)) === modified file 'lisp/cedet/ede/cpp-root.el' --- lisp/cedet/ede/cpp-root.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/ede/cpp-root.el 2011-11-03 20:03:45 +0000 @@ -21,7 +21,7 @@ ;;; Commentary: ;; -;; NOTE: ede-cpp-root.el has been commented so as to also make it +;; NOTE: ede/cpp-root.el has been commented so as to also make it ;; useful for learning how to make similar project types. ;; ;; Not everyone can use automake, or an EDE project type. For === modified file 'lisp/cedet/ede/custom.el' --- lisp/cedet/ede/custom.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/ede/custom.el 2011-11-03 20:03:45 +0000 @@ -1,4 +1,4 @@ -;;; ede.el --- customization of EDE projects. +;;; ede/custom.el --- customization of EDE projects. ;; Copyright (C) 2010-2011 Free Software Foundation, Inc. === modified file 'lisp/cedet/ede/generic.el' --- lisp/cedet/ede/generic.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/ede/generic.el 2011-11-03 20:03:45 +0000 @@ -22,7 +22,7 @@ ;;; Commentary: ;; ;; There are a lot of build systems out there, and EDE can't support -;; them all fully. The ede-generic.el system is the base for +;; them all fully. The ede/generic.el system is the base for ;; supporting alternate build systems in a simple way, automatically. ;; ;; The structure is for the ede-generic baseclass, which is augmented === modified file 'lisp/cedet/ede/proj-comp.el' --- lisp/cedet/ede/proj-comp.el 2011-04-23 03:07:16 +0000 +++ lisp/cedet/ede/proj-comp.el 2011-11-03 20:03:45 +0000 @@ -83,7 +83,7 @@ :documentation "The commands used to execute this compiler. The object which uses this compiler will place these commands after -it's rule definition.") +its rule definition.") (autoconf :initarg :autoconf :initform nil :type list === modified file 'lisp/cedet/semantic/analyze/complete.el' --- lisp/cedet/semantic/analyze/complete.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/analyze/complete.el 2011-11-03 20:03:45 +0000 @@ -28,7 +28,7 @@ ;; ;;; History: ;; -;; Code was moved here from semantic-analyze.el +;; Code was moved here from semantic/analyze.el (require 'semantic/analyze) === modified file 'lisp/cedet/semantic/ctxt.el' --- lisp/cedet/semantic/ctxt.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/ctxt.el 2011-11-03 20:03:45 +0000 @@ -106,7 +106,7 @@ (let ((start (point))) (if (semantic-up-context) t - ;; Go over the list, and back over the end parenthisis. + ;; Go over the list, and back over the end parenthesis. (condition-case nil (progn (forward-sexp 1) === modified file 'lisp/cedet/semantic/db-find.el' --- lisp/cedet/semantic/db-find.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/db-find.el 2011-11-03 20:03:45 +0000 @@ -79,13 +79,13 @@ ;; The PATH argument is then the most interesting argument. It can ;; have these values: ;; -;; nil - Take the current buffer, and use it's include list +;; nil - Take the current buffer, and use its include list ;; buffer - Use that buffer's include list. ;; filename - Use that file's include list. If the file is not ;; in a buffer, see of there is a semanticdb table for it. If ;; not, read that file into a buffer. ;; tag - Get that tag's buffer of file file. See above. -;; table - Search that table, and it's include list. +;; table - Search that table, and its include list. ;; ;; Search Results: ;; === modified file 'lisp/cedet/semantic/db-typecache.el' --- lisp/cedet/semantic/db-typecache.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/db-typecache.el 2011-11-03 20:03:45 +0000 @@ -1,4 +1,4 @@ -;;; db-typecache.el --- Manage Datatypes +;;; semantic/db-typecache.el --- Manage Datatypes ;; Copyright (C) 2007-2011 Free Software Foundation, Inc. @@ -622,4 +622,4 @@ ;; generated-autoload-load-name: "semantic/db-typecache" ;; End: -;;; semanticdb-typecache.el ends here +;;; semantic/db-typecache.el ends here === modified file 'lisp/cedet/semantic/db.el' --- lisp/cedet/semantic/db.el 2011-07-04 15:36:38 +0000 +++ lisp/cedet/semantic/db.el 2011-11-03 20:03:45 +0000 @@ -229,7 +229,7 @@ :documentation "List of `semanticdb-table' objects refering to this one. These aren't saved, but are instead recalculated after load. -See the file semanticdb-ref.el for how this slot is used.") +See the file semantic/db-ref.el for how this slot is used.") (pointmax :initarg :pointmax :initform nil :documentation "Size of buffer when written to disk. @@ -441,7 +441,7 @@ needed. Cache objects are identified in semanticdb by subclass. In order to keep your cache up to date, be sure to implement `semanticdb-synchronize', and `semanticdb-partial-synchronize'. -See the file semantic-scope.el for an example." +See the file semantic/scope.el for an example." :abstract t) (defmethod semanticdb-cache-get ((table semanticdb-abstract-table) @@ -492,7 +492,7 @@ needed. Cache objects are identified in semanticdb by subclass. In order to keep your cache up to date, be sure to implement `semanticdb-synchronize', and `semanticdb-partial-synchronize'. -See the file semantic-scope.el for an example." +See the file semantic/scope.el for an example." :abstract t) (defmethod semanticdb-cache-get ((db semanticdb-project-database) === modified file 'lisp/cedet/semantic/decorate/include.el' --- lisp/cedet/semantic/decorate/include.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/decorate/include.el 2011-11-03 20:03:45 +0000 @@ -471,7 +471,7 @@ (ede-cpp-root-project \"NAME\" :file \"FILENAME\" :locate-fcn 'MYFCN) See the CEDET manual, the EDE manual, or the commentary in -ede-cpp-root.el for more. +ede/cpp-root.el for more. If you think this header tag is marked in error, you may need to do: === modified file 'lisp/cedet/semantic/ede-grammar.el' --- lisp/cedet/semantic/ede-grammar.el 2011-01-26 08:36:39 +0000 +++ lisp/cedet/semantic/ede-grammar.el 2011-11-03 20:03:45 +0000 @@ -71,8 +71,8 @@ "@for loadpath in . ${LOADPATH}; do \\" " echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\" "done;" - "@echo \"(require 'semantic-load)\" >> grammar-make-script" - "@echo \"(require 'semantic-grammar)\" >> grammar-make-script" + "@echo \"(require 'semantic/load)\" >> grammar-make-script" + "@echo \"(require 'semantic/grammar)\" >> grammar-make-script" ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script" "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^" ) @@ -101,8 +101,8 @@ "@for loadpath in . ${LOADPATH}; do \\" " echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\" "done;" - "@echo \"(require 'semantic-load)\" >> grammar-make-script" - "@echo \"(require 'semantic-grammar)\" >> grammar-make-script" + "@echo \"(require 'semantic/load)\" >> grammar-make-script" + "@echo \"(require 'semantic/grammar)\" >> grammar-make-script" ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script" "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^" ) === modified file 'lisp/cedet/semantic/find.el' --- lisp/cedet/semantic/find.el 2011-01-26 08:36:39 +0000 +++ lisp/cedet/semantic/find.el 2011-11-03 20:03:45 +0000 @@ -333,7 +333,7 @@ ;;;###autoload (define-overloadable-function semantic-find-tags-by-scope-protection (scopeprotection parent &optional table) - "Find all tags accessable by SCOPEPROTECTION. + "Find all tags accessible by SCOPEPROTECTION. SCOPEPROTECTION is a symbol which can be returned by the method `semantic-tag-protection'. A hard-coded order is used to determine a match. PARENT is a tag representing the PARENT slot needed for === modified file 'lisp/cedet/semantic/html.el' --- lisp/cedet/semantic/html.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/html.el 2011-11-03 20:03:45 +0000 @@ -222,7 +222,7 @@ "The children TAG expands to." (semantic-html-components tag)) -;; In semantic-imenu.el, not part of Emacs. +;; In semantic/imenu.el, not part of Emacs. (defvar semantic-imenu-expandable-tag-classes) (defvar semantic-imenu-bucketize-file) (defvar semantic-imenu-bucketize-type-members) === modified file 'lisp/cedet/semantic/idle.el' --- lisp/cedet/semantic/idle.el 2011-01-26 08:36:39 +0000 +++ lisp/cedet/semantic/idle.el 2011-11-03 20:03:45 +0000 @@ -1314,4 +1314,4 @@ ;; generated-autoload-load-name: "semantic/idle" ;; End: -;;; semantic-idle.el ends here +;;; semantic/idle.el ends here === modified file 'lisp/cedet/semantic/java.el' --- lisp/cedet/semantic/java.el 2011-02-28 01:07:29 +0000 +++ lisp/cedet/semantic/java.el 2011-11-03 20:03:45 +0000 @@ -256,7 +256,7 @@ (define-mode-local-override semantic-documentation-for-tag java-mode (&optional tag nosnarf) "Find documentation from TAG and return it as a clean string. -Java has documentation set in a comment preceding TAG's definition. +Java have documentation set in a comment preceding TAG's definition. Attempt to strip out comment syntactic sugar, unless optional argument NOSNARF is non-nil. If NOSNARF is 'lex, then return the semantic lex token." === modified file 'lisp/cedet/semantic/lex-spp.el' --- lisp/cedet/semantic/lex-spp.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/lex-spp.el 2011-11-03 20:03:45 +0000 @@ -1,4 +1,4 @@ -;;; lex-spp.el --- Semantic Lexical Pre-processor +;;; semantic/lex-spp.el --- Semantic Lexical Pre-processor ;; Copyright (C) 2006-2011 Free Software Foundation, Inc. @@ -1230,4 +1230,4 @@ ;; generated-autoload-load-name: "semantic/lex-spp" ;; End: -;;; semantic-lex-spp.el ends here +;;; semantic/lex-spp.el ends here === modified file 'lisp/cedet/semantic/sort.el' --- lisp/cedet/semantic/sort.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/sort.el 2011-11-03 20:03:45 +0000 @@ -1,4 +1,4 @@ -;;; sort.el --- Utilities for sorting and re-arranging tag tables. +;;; semantic/sort.el --- Utilities for sorting and re-arranging tag tables. ;;; Copyright (C) 1999-2005, 2007-2011 Free Software Foundation, Inc. @@ -27,7 +27,7 @@ ;; purposes. Re-organization may be alphabetical, or even a complete ;; reorganization of parents and children. ;; -;; Originally written in semantic-util.el +;; Originally written in semantic/util.el ;; (require 'semantic) @@ -565,4 +565,4 @@ ;; generated-autoload-load-name: "semantic/sort" ;; End: -;;; semantic-sort.el ends here +;;; semantic/sort.el ends here === modified file 'lisp/cedet/semantic/texi.el' --- lisp/cedet/semantic/texi.el 2011-01-26 08:36:39 +0000 +++ lisp/cedet/semantic/texi.el 2011-11-03 20:03:45 +0000 @@ -446,7 +446,7 @@ ;;; Parser Setup ;; -;; In semantic-imenu.el, not part of Emacs. +;; In semantic/imenu.el, not part of Emacs. (defvar semantic-imenu-expandable-tag-classes) (defvar semantic-imenu-bucketize-file) (defvar semantic-imenu-bucketize-type-members) @@ -592,7 +592,7 @@ ;; (error "Could not find documentation for %s" (semantic-tag-name tag))) ;; ;; (require 'srecode) -;; (require 'srecode-texi) +;; (require 'srecode/texi) ;; ;; ;; If we have a string, do the replacement. ;; (delete-region (semantic-tag-start tag) === modified file 'lisp/cedet/semantic/wisent/java-tags.el' --- lisp/cedet/semantic/wisent/java-tags.el 2011-01-26 08:36:39 +0000 +++ lisp/cedet/semantic/wisent/java-tags.el 2011-11-03 20:03:45 +0000 @@ -77,7 +77,7 @@ ;;;; Semantic integration of the Java LALR parser ;;;; -;; In semantic-imenu.el, not part of Emacs. +;; In semantic/imenu.el, not part of Emacs. (defvar semantic-imenu-summary-function) ;;;###autoload === modified file 'lisp/cedet/srecode.el' --- lisp/cedet/srecode.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/srecode.el 2011-11-03 20:03:45 +0000 @@ -31,7 +31,7 @@ ;; ;; Contemplation of the simplistic problem within the scope of ;; semantic showed that the solution was more complex than could -;; possibly be handled in semantic-format.el. Semantic Recode, or +;; possibly be handled in semantic/format.el. Semantic Recode, or ;; srecode is a rich API for generating code out of semantic tags, or ;; recoding the tags. ;; === modified file 'lisp/cedet/srecode/compile.el' --- lisp/cedet/srecode/compile.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/srecode/compile.el 2011-11-03 20:03:45 +0000 @@ -103,7 +103,7 @@ ;; work, and the smaller, simple inserter object is saved in ;; the compiled templates. ;; -;; See srecode-insert.el for the specialized classes. +;; See srecode/insert.el for the specialized classes. ;; (defclass srecode-template-inserter (eieio-named) ((secondname :initarg :secondname === modified file 'lisp/cedet/srecode/dictionary.el' --- lisp/cedet/srecode/dictionary.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/srecode/dictionary.el 2011-11-03 20:03:45 +0000 @@ -1,4 +1,4 @@ -;;; srecode-dictionary.el --- Dictionary code for the semantic recoder. +;;; srecode/dictionary.el --- Dictionary code for the semantic recoder. ;; Copyright (C) 2007-2011 Free Software Foundation, Inc. === modified file 'lisp/cedet/srecode/document.el' --- lisp/cedet/srecode/document.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/srecode/document.el 2011-11-03 20:03:45 +0000 @@ -37,7 +37,7 @@ ;; Document has now been ported to srecode, using the semantic recoder ;; as the templating engine. -;; This file combines srecode-document.el and srecode-document-vars.el +;; This file combines srecode/document.el and srecode/document-vars.el ;; from the CEDET repository. (require 'srecode/args) === modified file 'lisp/cedet/srecode/insert.el' --- lisp/cedet/srecode/insert.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/srecode/insert.el 2011-11-03 20:03:45 +0000 @@ -1,4 +1,4 @@ -;;; srecode/insert --- Insert srecode templates to an output stream. +;;; srecode/insert.el --- Insert srecode templates to an output stream. ;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc. @@ -911,7 +911,7 @@ (setq active (cdr active))) (when (not tmpl) ;; If it wasn't in this context, look to see if it - ;; defines it's own context + ;; defines its own context (setq tmpl (srecode-template-get-table (srecode-table) templatenamepart))) ) === modified file 'lisp/cedet/srecode/java.el' --- lisp/cedet/srecode/java.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/srecode/java.el 2011-11-03 20:03:45 +0000 @@ -1,4 +1,4 @@ -;;; srecode-java.el --- Srecode Java support +;;; srecode/java.el --- Srecode Java support ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. === modified file 'lisp/cedet/srecode/template.el' --- lisp/cedet/srecode/template.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/srecode/template.el 2011-11-03 20:03:45 +0000 @@ -1,4 +1,4 @@ -;;; srecode-template.el --- SRecoder template language parser support. +;;; srecode/template.el --- SRecoder template language parser support. ;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc. === modified file 'lisp/cedet/srecode/texi.el' --- lisp/cedet/srecode/texi.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/srecode/texi.el 2011-11-03 20:03:45 +0000 @@ -1,4 +1,4 @@ -;;; srecode-texi.el --- Srecode texinfo support. +;;; srecode/texi.el --- Srecode texinfo support. ;; Copyright (C) 2008-2011 Free Software Foundation, Inc. ------------------------------------------------------------ revno: 106275 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2011-11-03 15:28:45 -0400 message: * lisp/gnus/nnimap.el (nnimap-open-connection-1): Use tcp-keealive if possible. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-02 22:59:23 +0000 +++ lisp/gnus/ChangeLog 2011-11-03 19:28:45 +0000 @@ -1,3 +1,7 @@ +2011-11-03 Stefan Monnier + + * nnimap.el (nnimap-open-connection-1): Use tcp-keealive if possible. + 2011-11-02 Teodor Zlatanov * gnus-util.el (gnus-bound-and-true-p): Another comment to explain why === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-09-26 22:52:31 +0000 +++ lisp/gnus/nnimap.el 2011-11-03 19:28:45 +0000 @@ -397,6 +397,14 @@ (stream-type (plist-get props :type))) (when (and stream (not (memq (process-status stream) '(open run)))) (setq stream nil)) + + (when (and (fboundp 'set-network-process-option) ;; Not in XEmacs. + (fboundp 'process-type) ;; Emacs 22 doesn't provide it. + (eq (process-type stream) 'network)) + ;; Use TCP-keepalive so that connections that pass through a NAT + ;; router don't hang when left idle. + (set-network-process-option stream :keepalive t)) + (setf (nnimap-process nnimap-object) stream) (setf (nnimap-stream-type nnimap-object) stream-type) (if (not stream) ------------------------------------------------------------ revno: 106274 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-11-03 21:06:42 +0200 message: src/ChangeLog: Fix entry for last commit. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-03 19:04:18 +0000 +++ src/ChangeLog 2011-11-03 19:06:42 +0000 @@ -1,7 +1,7 @@ 2011-11-03 Eli Zaretskii * w32fns.c (unwind_create_frame): If needed, free the glyph - matrices of the partially constructed frame. + matrices of the partially constructed frame. (Bug#9943) 2011-11-01 Eli Zaretskii ------------------------------------------------------------ revno: 106273 fixes bug(s): http://debbugs.gnu.org/9943 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-11-03 21:04:18 +0200 message: Fix bug #9943 with abort at shutdown. src/w32fns.c (unwind_create_frame): If needed, free the glyph matrices of the partially constructed frame. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-01 19:19:07 +0000 +++ src/ChangeLog 2011-11-03 19:04:18 +0000 @@ -1,3 +1,8 @@ +2011-11-03 Eli Zaretskii + + * w32fns.c (unwind_create_frame): If needed, free the glyph + matrices of the partially constructed frame. + 2011-11-01 Eli Zaretskii * xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment. === modified file 'src/w32fns.c' --- src/w32fns.c 2011-10-26 13:42:33 +0000 +++ src/w32fns.c 2011-11-03 19:04:18 +0000 @@ -3993,6 +3993,7 @@ #endif x_free_frame_resources (f); + free_glyphs (f); #if GLYPH_DEBUG /* Check that reference counts are indeed correct. */ ------------------------------------------------------------ revno: 106272 author: Teodor Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-11-02 22:59:23 +0000 message: gnus-util.el (gnus-bound-and-true-p): Another comment to explain why we don't use `bound-and-true-p'. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-02 07:28:14 +0000 +++ lisp/gnus/ChangeLog 2011-11-02 22:59:23 +0000 @@ -1,3 +1,8 @@ +2011-11-02 Teodor Zlatanov + + * gnus-util.el (gnus-bound-and-true-p): Another comment to explain why + we don't use `bound-and-true-p'. + 2011-11-01 Teodor Zlatanov * gnus-util.el (gnus-bound-and-true-p): Remove. === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2011-11-02 07:28:14 +0000 +++ lisp/gnus/gnus-util.el 2011-11-02 22:59:23 +0000 @@ -1986,7 +1986,8 @@ (gnus-macroexpand-all expanded environment))) form)))) -;; simple check, can be a macro but this way, although slow, it's really clear +;; Simple check: can be a macro but this way, although slow, it's really clear. +;; We don't use `bound-and-true-p' because it's not in XEmacs. (defun gnus-bound-and-true-p (sym) (and (boundp sym) (symbol-value sym))) ------------------------------------------------------------ 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) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.