Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103449. ------------------------------------------------------------ revno: 103449 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2011-02-28 05:24:40 +0100 message: lisp/emacs-lisp/pcase.el (pcase, pcase--u1, pcase--q1): Fix typos in docstrings. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-28 01:35:59 +0000 +++ lisp/ChangeLog 2011-02-28 04:24:40 +0000 @@ -1,3 +1,8 @@ +2011-02-28 Juanma Barranquero + + * emacs-lisp/pcase.el (pcase, pcase--u1, pcase--q1): + Fix typos in docstrings. + 2011-02-28 Stephen Berman * dired-aux.el (dired-update-file-line): === modified file 'lisp/emacs-lisp/pcase.el' --- lisp/emacs-lisp/pcase.el 2011-02-27 02:50:38 +0000 +++ lisp/emacs-lisp/pcase.el 2011-02-28 04:24:40 +0000 @@ -3,7 +3,7 @@ ;; Copyright (C) 2010-2011 Free Software Foundation, Inc. ;; Author: Stefan Monnier -;; Keywords: +;; Keywords: ;; This file is part of GNU Emacs. @@ -75,12 +75,12 @@ QPatterns can take the following forms: (QPAT1 . QPAT2) matches if QPAT1 matches the car and QPAT2 the cdr. ,UPAT matches if the UPattern UPAT matches. - STRING matches if the object is `equal' to STRING. + STRING matches if the object is `equal' to STRING. ATOM matches if the object is `eq' to ATOM. QPatterns for vectors are not implemented yet. PRED can take the form - FUNCTION in which case it gets called with one argument. + FUNCTION in which case it gets called with one argument. (FUN ARG1 .. ARGN) in which case it gets called with N+1 arguments. A PRED of the form FUNCTION is equivalent to one of the form (FUNCTION). PRED patterns can refer to variables bound earlier in the pattern. @@ -439,7 +439,7 @@ ;; bootstrapping problems. (defun pcase--u1 (matches code vars rest) "Return code that runs CODE (with VARS) if MATCHES match. -and otherwise defers to REST which is a list of branches of the form +Otherwise, it defers to REST which is a list of branches of the form \(ELSE-MATCH ELSE-CODE . ELSE-VARS)." ;; Depending on the order in which we choose to check each of the MATCHES, ;; the resulting tree may be smaller or bigger. So in general, we'd want @@ -591,7 +591,7 @@ (defun pcase--q1 (sym qpat matches code vars rest) "Return code that runs CODE if SYM matches QPAT and if MATCHES match. -and if not, defers to REST which is a list of branches of the form +Otherwise, it defers to REST which is a list of branches of the form \(OTHER_MATCH OTHER-CODE . OTHER-VARS)." (cond ((eq (car-safe qpat) '\,) (error "Can't use `,UPATTERN")) ------------------------------------------------------------ revno: 103448 committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-02-27 17:35:59 -0800 message: Add ChangeLog bug ref. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-28 01:31:20 +0000 +++ lisp/ChangeLog 2011-02-28 01:35:59 +0000 @@ -1522,8 +1522,7 @@ (allout-command-prefix) (allout-prefixed-keybindings) (allout-unprefixed-keybindings): Use allout-compose-and-institute-keymap to process the bindings. - (allout-unprefixed-keybindings): Remove extraneous '?' question - marks. + (allout-unprefixed-keybindings): Remove extraneous '?' question marks. (allout-prefixed-keybindings): Elide binding to (prefixed) \C-h - user can customize if they want to use that binding. Bind allout-copy-topic-as-kill to (prefixed) \M-k. @@ -1532,14 +1531,12 @@ (allout-hotspot-key-handler): Remove attempt to resolve the key through the literal key-string lookup on allout-keybindings-list. That probably hasn't worked for a Long Time, and removal of - allout-keybindings-list further simplifies the keybindings - situation. + allout-keybindings-list further simplifies the keybindings situation. (allout-pre-command-business): Use allout-mode-map-value instead of allout-mode-map. (allout-preempt-trailing-ctrl-h): Remove. The user can customize the bindings if they want to use a keybinding having a trailing - \C-h. No deprecation needed since this feature was never in a - release. + \C-h. No deprecation needed since this feature was never in a release. (allout-keybindings-list): Remove. It's not been useful for a while. (See allout-hotspot-key-handler changes, above.) (produce-allout-mode-map): Remove. Consolidate into @@ -2721,7 +2718,7 @@ this original name from `bookmark-name-from-record' reverting part of rev 102609 / kfogel@red-bean.com-20101208080927-5j9jqnb2xvcw4ogm. As Drew Adams pointed out, there was no reason to cause churn for - third-party callers. + third-party callers. (Bug#7609) 2010-12-12 Alan Mackenzie ------------------------------------------------------------ revno: 103447 author: Stephen Berman committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-02-27 17:31:20 -0800 message: dired-aux fix for bug#8131. * lisp/dired-aux.el (dired-update-file-line): Fix 2010-11-09 change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-28 01:10:58 +0000 +++ lisp/ChangeLog 2011-02-28 01:31:20 +0000 @@ -1,3 +1,8 @@ +2011-02-28 Stephen Berman + + * dired-aux.el (dired-update-file-line): + Fix 2010-11-09 change. (Bug#8131) + 2011-02-28 Eli Zaretskii * international/mule-cmds.el (set-default-coding-systems): Use the === modified file 'lisp/dired-aux.el' --- lisp/dired-aux.el 2011-02-19 19:20:38 +0000 +++ lisp/dired-aux.el 2011-02-28 01:31:20 +0000 @@ -1025,9 +1025,9 @@ ;; Keeps any marks that may be present in column one (doing this ;; here is faster than with dired-add-entry's optional arg). ;; Does not update other dired buffers. Use dired-relist-entry for that. - (let ((char (following-char)) - (opoint (line-beginning-position)) - (buffer-read-only)) + (let* ((opoint (line-beginning-position)) + (char (char-after opoint)) + (buffer-read-only)) (delete-region opoint (progn (forward-line 1) (point))) (if file (progn ------------------------------------------------------------ revno: 103446 committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-02-27 17:10:58 -0800 message: Mark tiny change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-28 01:07:29 +0000 +++ lisp/ChangeLog 2011-02-28 01:10:58 +0000 @@ -8,7 +8,7 @@ * facemenu.el (list-colors-display): Use with-help-window (Bug#8048). -2011-02-27 Prestoo Ten +2011-02-27 Prestoo Ten (tiny change) * term/screen.el: New file (Bug#2650). ------------------------------------------------------------ revno: 103445 [merge] committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-02-27 17:07:29 -0800 message: Merge from emacs-23; up to r100510. diff: === modified file 'ChangeLog' --- ChangeLog 2011-02-26 09:35:07 +0000 +++ ChangeLog 2011-02-28 01:07:29 +0000 @@ -7634,7 +7634,7 @@ * Makefile.in (lib-src/Makefile, src/Makefile, oldXMenu/Makefile): Depend on vpath.sed. - Replace sed comand for VPATH with @vpath_sed@. + Replace sed command for VPATH with @vpath_sed@. * configure.in: Substitute variable `vpath_sed'. If not in $srcdir and $srcdir is configured, @@ -8975,7 +8975,7 @@ there, and then copy it in, to make sure we get a real file. * make-dist: Don't try to distribute *.defns files any more. The - only such file was for simula.el, which has been superceded by a + only such file was for simula.el, which has been superseded by a version which doesn't have a separate .defns file. 1992-05-28 Ken Raeburn (Raeburn@Cygnus.COM) === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-02-19 19:40:59 +0000 +++ doc/emacs/ChangeLog 2011-02-28 01:07:29 +0000 @@ -1,3 +1,8 @@ +2011-02-28 Eli Zaretskii + + * search.texi (Regexp Search): Move index entries about regexps to the + "Regexps" node. Add index entries for regexp search. (Bug#8096) + 2011-02-19 Glenn Morris * dired.texi (Dired): Dired-X version number was dropped. === modified file 'doc/emacs/search.texi' --- doc/emacs/search.texi 2011-01-31 23:54:50 +0000 +++ doc/emacs/search.texi 2011-02-28 01:07:29 +0000 @@ -468,8 +468,8 @@ @node Regexp Search @section Regular Expression Search -@cindex regular expression -@cindex regexp +@cindex regexp search +@cindex search for a regular expression A @dfn{regular expression} (or @dfn{regexp} for short) is a pattern that denotes a class of alternative strings to match. GNU Emacs @@ -543,6 +543,8 @@ @node Regexps @section Syntax of Regular Expressions @cindex syntax of regexps +@cindex regular expression +@cindex regexp This manual describes regular expression features that users typically use. @xref{Regular Expressions,,, elisp, The Emacs Lisp === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-02-27 22:10:48 +0000 +++ doc/lispref/ChangeLog 2011-02-28 01:07:29 +0000 @@ -1,3 +1,8 @@ +2011-02-28 Glenn Morris + + * variables.texi (Directory Local Variables): Mention the optional + mtime argument of dir-locals-set-directory-class. (Bug#3577) + 2011-02-27 Chong Yidong * minibuf.texi (Minibuffer History): Clarify discussion of === modified file 'doc/lispref/variables.texi' --- doc/lispref/variables.texi 2011-02-19 19:40:59 +0000 +++ doc/lispref/variables.texi 2011-02-28 01:07:29 +0000 @@ -1757,12 +1757,19 @@ of the two forms accepted by this function in @var{variables}. @end defun -@defun dir-locals-set-directory-class directory class +@defun dir-locals-set-directory-class directory class &optional mtime This function assigns @var{class} to all the files in @code{directory} and its subdirectories. Thereafter, all the variable settings specified for @var{class} will be applied to any visited file in @var{directory} and its children. @var{class} must have been already -defined by @code{dir-locals-set-class-variables} +defined by @code{dir-locals-set-class-variables}. + +Emacs uses this function internally when it loads directory variables +from a @code{.dir-locals.el} file. In that case, the optional +argument @var{mtime} holds the file modification time (as returned by +@code{file-attributes}). Emacs uses this time to check stored +local variables are still valid. If you are assigning a class +directly, not via a file, this argument should be @code{nil}. @end defun @defvar dir-locals-class-alist @@ -1772,8 +1779,9 @@ @defvar dir-locals-directory-cache This alist holds directory names, their assigned class names, and -modification times of the associated directory local variables file. -It is updated by @code{dir-locals-set-directory-class}. +modification times of the associated directory local variables file +(if there is one). The function @code{dir-locals-set-directory-class} +updates this list. @end defvar @node Frame-Local Variables === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-02-23 13:35:35 +0000 +++ doc/misc/ChangeLog 2011-02-28 01:07:29 +0000 @@ -1,3 +1,7 @@ +2011-02-28 Glenn Morris + + * dbus.texi (Type Conversion): Grammar fix. + 2011-02-23 Michael Albinus * tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and === modified file 'doc/misc/dbus.texi' --- doc/misc/dbus.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/dbus.texi 2011-02-28 01:07:29 +0000 @@ -893,10 +893,10 @@ @end example Other Lisp objects, like symbols or hash tables, are not accepted as -input parameter. +input parameters. If it is necessary to use another D-Bus type, a corresponding type -symbol can be preceeded to the corresponding Lisp object. Basic D-Bus +symbol can be prepended to the corresponding Lisp object. Basic D-Bus types are represented by the type symbols @code{:byte}, @code{:boolean}, @code{:int16}, @code{:uint16}, @code{:int32}, @code{:uint32}, @code{:int64}, @code{:uint64}, @code{:double}, === modified file 'doc/misc/semantic.texi' --- doc/misc/semantic.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/semantic.texi 2011-02-28 01:07:29 +0000 @@ -64,7 +64,7 @@ @macro obsolete{old,new} @sp 1 @strong{Compatibility}: -@code{\new\} introduced in @semantic{} version 2.0 supercedes +@code{\new\} introduced in @semantic{} version 2.0 supersedes @code{\old\} which is now obsolete. @end macro === modified file 'etc/NEWS.23' --- etc/NEWS.23 2011-02-05 22:30:14 +0000 +++ etc/NEWS.23 2011-02-28 01:07:29 +0000 @@ -1746,7 +1746,7 @@ *** hide-ifdef-mode allows shadowing ifdef-blocks instead of hiding them. See option `hide-ifdef-shadow' and function `hide-ifdef-toggle-shadowing'. -*** `icomplete-prospects-height' now supercedes `icomplete-prospects-length'. +*** `icomplete-prospects-height' now supersedes `icomplete-prospects-length'. *** Info displays breadcrumbs in the header of the page. See Info-breadcrumbs-depth to control it. === modified file 'leim/ChangeLog' --- leim/ChangeLog 2011-01-28 01:51:41 +0000 +++ leim/ChangeLog 2011-02-28 01:07:29 +0000 @@ -1,3 +1,7 @@ +2011-02-28 Juanma Barranquero + + * quail/ethiopic.el ("ethiopic"): Fix tpo in docstring. + 2011-01-28 Paul Eggert Redo spelling of Makefile variables to conform to POSIX. @@ -27,8 +31,8 @@ 2010-08-28 Kenichi Handa - * quail/japanese.el (quail-japanese-update-translation): Fix - handling of invalid key. + * quail/japanese.el (quail-japanese-update-translation): + Fix handling of invalid key. 2010-08-15 Andreas Schwab @@ -46,8 +50,7 @@ 2010-08-13 Kenichi Handa - * quail/greek.el ("greek-postfix"): Add rules for Greek style - quotes. + * quail/greek.el ("greek-postfix"): Add rules for Greek style quotes. 2010-08-09 Kenichi Handa === modified file 'leim/quail/cyrillic.el' --- leim/quail/cyrillic.el 2011-01-26 08:36:39 +0000 +++ leim/quail/cyrillic.el 2011-02-28 01:07:29 +0000 @@ -39,7 +39,7 @@ ;; This was `cyrillic-jcuken'. Alexander Mikhailian ;; says: "cyrillic-jcuken" is actually ;; russian. It is ok but a bit outdated. This layout has been used -;; in typewriters for ages but it has been superceeded on desktops by +;; in typewriters for ages but it has been superseded on desktops by ;; a variation of this layout, implemented in M$ Windows software. ;; The Windows layout is greatly preferred because of the comma and ;; period being placed more conviniently and, of course, because of === modified file 'leim/quail/ethiopic.el' --- leim/quail/ethiopic.el 2011-01-15 23:16:57 +0000 +++ leim/quail/ethiopic.el 2011-02-28 01:07:29 +0000 @@ -62,7 +62,7 @@ C-' or `M-x ethio-gemination' Compose the character before the point with the Ethiopic gemination mark. - If the characater is already composed, decompose it and remove the + If the character is already composed, decompose it and remove the gemination mark." ;; The following keys should work as defined in lisp/language/ethio-util, === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-27 23:53:41 +0000 +++ lisp/ChangeLog 2011-02-28 01:07:29 +0000 @@ -1,3 +1,9 @@ +2011-02-28 Eli Zaretskii + + * international/mule-cmds.el (set-default-coding-systems): Use the + -unix variant of encoding in default-keyboard-coding-system. + (Bug#8122) + 2011-02-27 Chong Yidong * facemenu.el (list-colors-display): Use with-help-window (Bug#8048). @@ -4670,7 +4676,7 @@ 2010-10-24 Michael McNamara - * verilog-mode.el (verilog-directive-re): Make this variable + * progmodes/verilog-mode.el (verilog-directive-re): Make this variable auto-built for efficiency of execution and updating. (verilog-extended-complete-re): Support 'pure' fucntion & task declarations (these have no bodies). @@ -4704,7 +4710,7 @@ 2010-10-24 Wilson Snyder - * verilog-mode.el (verilog-auto-inst, verilog-gate-ios) + * progmodes/verilog-mode.el (verilog-auto-inst, verilog-gate-ios) (verilog-gate-keywords, verilog-read-sub-decls) (verilog-read-sub-decls-gate, verilog-read-sub-decls-gate-ios) (verilog-read-sub-decls-line, verilog-read-sub-decls-sig): Support === modified file 'lisp/ChangeLog.10' --- lisp/ChangeLog.10 2011-01-25 04:08:28 +0000 +++ lisp/ChangeLog.10 2011-02-28 01:07:29 +0000 @@ -20591,7 +20591,7 @@ * viper-cmd.el (viper-change-state): Got rid of make-local-hook. (viper-special-read-and-insert-char): Make C-m work right in the r - comand. + command. (viper-buffer-search-enable): Fixed format string. * viper-ex.el (ex-token-alist): Use ex-set-visited-file-name === modified file 'lisp/ChangeLog.12' --- lisp/ChangeLog.12 2011-01-25 04:08:28 +0000 +++ lisp/ChangeLog.12 2011-02-28 01:07:29 +0000 @@ -11678,7 +11678,7 @@ make underlining work for wide characters. (org-goto-map, org-agenda-mode-map, org-mode-map): Explicitly bind TAB to `org-cycle', to make sure that no binding in - `outline-mode-map' can supercede it. + `outline-mode-map' can supersede it. 2006-03-14 Ken Manheimer @@ -19139,7 +19139,7 @@ * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to pgg-decrypt-region. (pgg-pending-timers): A new hash for tracking the passphrase cache - timers, so that new ones supercede old ones. + timers, so that new ones supersede old ones. (pgg-add-passphrase-to-cache): Rename from `pgg-add-passphrase-cache' to reduce confusion (all callers changed). Modified to cancel old timers when new ones are added. @@ -19225,7 +19225,7 @@ * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to pgg-decrypt-region. (pgg-pending-timers): A new hash for tracking the passphrase cache - timers, so that new ones supercede old ones. + timers, so that new ones supersede old ones. (pgg-add-passphrase-to-cache): Rename from `pgg-add-passphrase-cache' to reduce confusion (all callers changed). Modified to cancel old timers when new ones are added. === modified file 'lisp/ChangeLog.3' --- lisp/ChangeLog.3 2011-01-25 04:08:28 +0000 +++ lisp/ChangeLog.3 2011-02-28 01:07:29 +0000 @@ -4906,7 +4906,7 @@ * two-column.el: Doc fixes. * loaddefs.el (function-keymap): Definition deleted; this has been - superceded by function-key-map. + superseded by function-key-map. * gomoku.el (gomoku-mode-map): Use function key symbols, instead of the keypad.el facilities. @@ -6056,7 +6056,7 @@ and `fill-column'. Code now actually sets `left-margin' and `fill-column', as advertised. * text-mode.el (change-log-mode): Function deleted, since it's - been superceded by the one in add-log.el. + been superseded by the one in add-log.el. 1992-06-14 Richard Stallman (rms@mole.gnu.ai.mit.edu) @@ -6070,7 +6070,7 @@ 1992-06-12 Jim Blandy (jimb@pogo.cs.oberlin.edu) - * isearch-mode.el: New package, which will probably supercede + * isearch-mode.el: New package, which will probably supersede isearch.el. (isearch-mode-map, isearch-mode-meta-map): When initializing these, remember that vectors are no longer keymaps. @@ -10009,7 +10009,7 @@ display-time-string. (rmail-pop-up): Default display-time-hook to automatically retrieve new mail if the variable rmail-pop-up is non-nil. - (add-clock-handler): Removed; superceded by timer.el. + (add-clock-handler): Removed; superseded by timer.el. * loaddefs.el: Removed add-clock-handler. @@ -10032,7 +10032,7 @@ * loaddefs.el: Autoload for diff. - * files.el (diff): Superceded by diff.el. + * files.el (diff): Superseded by diff.el. (diff-switches-function): Still needs to be merged into diff.el. * diff.el: New file. === modified file 'lisp/allout.el' --- lisp/allout.el 2011-02-23 07:27:09 +0000 +++ lisp/allout.el 2011-02-28 01:07:29 +0000 @@ -339,7 +339,7 @@ -- positive numbers open to the relative depth indicated by the number, but do not force already opened subtopics to be closed. -- 0 means to close topic -- hide all subitems. - : -- repeat spec -- apply the preceeding element to all siblings at + : -- repeat spec -- apply the preceding element to all siblings at current level, *up to* those siblings that would be covered by specs following the `:' on the list. Ie, apply to all topics at level but trailing ones accounted for by trailing specs. (Only the first of @@ -3125,7 +3125,7 @@ nil) ;; rationale: if any intervening items were at a lower depth, we ;; would now be on the first offspring at the target depth -- ie, - ;; the preceeding item (per the search direction) must be at a + ;; the preceding item (per the search direction) must be at a ;; lesser depth. that's all we need to check. (if backward (allout-next-heading) (allout-previous-heading)) (if (< allout-recent-depth target-depth) @@ -4246,7 +4246,7 @@ With an argument greater than one, shift-in the item but not its offspring, making the item into a sibling of its former children, -and a child of sibling that formerly preceeded it. +and a child of sibling that formerly preceded it. You are not allowed to shift the first offspring of a topic inwards, because that would yield a \"containment @@ -5364,7 +5364,7 @@ (goto-char start) (beginning-of-line) - ;; Goto initial topic, and register preceeding stuff, if any: + ;; Goto initial topic, and register preceding stuff, if any: (if (> (allout-goto-prefix-doublechecked) start) ;; First topic follows beginning point -- register preliminary stuff: (setq result === modified file 'lisp/cedet/semantic/analyze.el' --- lisp/cedet/semantic/analyze.el 2011-01-26 08:36:39 +0000 +++ lisp/cedet/semantic/analyze.el 2011-02-28 01:07:29 +0000 @@ -100,7 +100,7 @@ :type list :documentation "List of tags defining local text. This can be nil, or a list where the last element can be a string -representing text that may be incomplete. Preceeding elements +representing text that may be incomplete. Preceding elements must be semantic tags representing variables or functions called in a dereference sequence.") (prefixclass :initarg :prefixclass === modified file 'lisp/cedet/semantic/complete.el' --- lisp/cedet/semantic/complete.el 2011-01-26 08:36:39 +0000 +++ lisp/cedet/semantic/complete.el 2011-02-28 01:07:29 +0000 @@ -1264,7 +1264,7 @@ ;; generated by a collector. This format is in semanticdb search ;; form. This vaguely standard form is a bit challenging to navigate ;; because the tags do not contain buffer info, but the file associated -;; with the tags preceed the tag in the list. +;; with the tags precedes the tag in the list. ;; ;; Basic displayors don't care, and can strip the results. ;; Advanced highlighting displayors need to know when they need === modified file 'lisp/cedet/semantic/edit.el' --- lisp/cedet/semantic/edit.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/edit.el 2011-02-28 01:07:29 +0000 @@ -426,7 +426,7 @@ ;; confirmed as the lineage of `overlapped-tags' ;; which must have a value by now. - ;; Loop over the search list to find the preceeding CDR. + ;; Loop over the search list to find the preceding CDR. ;; Fortunatly, (car overlapped-tags) happens to be ;; the first tag positionally. (let ((tokstart (semantic-tag-start (car overlapped-tags)))) @@ -874,7 +874,7 @@ )) (message "To Remove Middle Tag: (%s)" (semantic-format-tag-name first))) - ;; Find in the cache the preceeding tag + ;; Find in the cache the preceding tag (while (and cachestart (not (eq first (car (cdr cachestart))))) (setq cachestart (cdr cachestart))) ;; Find the last tag === modified file 'lisp/cedet/semantic/format.el' --- lisp/cedet/semantic/format.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/format.el 2011-02-28 01:07:29 +0000 @@ -296,7 +296,7 @@ (define-overloadable-function semantic-format-tag-canonical-name (tag &optional parent color) "Return a canonical name for TAG. -A canonical name includes the names of any parents or namespaces preceeding +A canonical name includes the names of any parents or namespaces preceding the tag. Optional argument PARENT is the parent type if TAG is a detail. Optional argument COLOR means highlight the prototype with font-lock colors.") === modified file 'lisp/cedet/semantic/java.el' --- lisp/cedet/semantic/java.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/java.el 2011-02-28 01:07:29 +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 have documentation set in a comment preceeding TAG's definition. +Java has 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/emulation/viper-cmd.el' --- lisp/emulation/viper-cmd.el 2011-01-25 04:08:28 +0000 +++ lisp/emulation/viper-cmd.el 2011-02-28 01:07:29 +0000 @@ -2375,7 +2375,7 @@ (if (eq viper-intermediate-command 'viper-repeat) (viper-change-subr (mark t) (point)) (viper-change (mark t) (point))) - ;; com is set to ?r when we repeat this comand with dot + ;; com is set to ?r when we repeat this command with dot (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil)) )) === modified file 'lisp/erc/ChangeLog.01' --- lisp/erc/ChangeLog.01 2011-01-25 04:08:28 +0000 +++ lisp/erc/ChangeLog.01 2011-02-28 01:07:29 +0000 @@ -584,9 +584,9 @@ * debian/maint/conffiles.in 1.1: new file - * debian/maint/conffiles 1.2: superceded by conffiles.in + * debian/maint/conffiles 1.2: superseded by conffiles.in - * debian/scripts/startup 1.2: superceded by startup.erc + * debian/scripts/startup 1.2: superseded by startup.erc 2001-10-25 Mario Lang @@ -609,7 +609,7 @@ * debian/maint/postinst 1.2, debian/maint/prerm 1.2, debian/scripts/install 1.2, debian/scripts/remove 1.2: - removed, superceded by it's .in counterpart + removed, superseded by its .in counterpart 2001-10-25 Mario Lang === modified file 'lisp/gnus/gnus-agent.el' --- lisp/gnus/gnus-agent.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/gnus-agent.el 2011-02-28 01:07:29 +0000 @@ -441,7 +441,7 @@ (setf (gnus-agent-cat-groups old-category) (delete group (gnus-agent-cat-groups old-category)))))) - ;; Purge cache as preceeding loop invalidated it. + ;; Purge cache as preceding loop invalidated it. (setq gnus-category-group-cache nil)) (setcdr (or (assq 'agent-groups category) @@ -1195,7 +1195,7 @@ (mapc #'gnus-summary-remove-process-mark (gnus-sorted-ndifference gnus-newsgroup-processable gnus-newsgroup-undownloaded)) - ;; The preceeding call to (gnus-agent-summary-fetch-group) + ;; The preceding call to (gnus-agent-summary-fetch-group) ;; updated the temporary gnus-newsgroup-downloadable to ;; remove each article successfully fetched. Now, I ;; update the real gnus-newsgroup-downloadable to only @@ -1520,14 +1520,14 @@ header-number) ;; Check each article (while (setq article (pop articles)) - ;; Skip alist entries preceeding this article + ;; Skip alist entries preceding this article (while (> article (or (caar alist) (1+ article))) (setq alist (cdr alist))) ;; Prune off articles that we have already fetched. (unless (and (eq article (caar alist)) (cdar alist)) - ;; Skip headers preceeding this article + ;; Skip headers preceding this article (while (> article (setq header-number (let* ((header (car headers))) @@ -3437,7 +3437,7 @@ ;; If considering all articles is set, I can only ;; expire article IDs that are no longer in the - ;; active range (That is, articles that preceed the + ;; active range (That is, articles that precede the ;; first article in the new alist). (if (and gnus-agent-consider-all-articles (>= article-number (car active))) @@ -3715,7 +3715,7 @@ (gnus-agent-append-to-list tail-uncached v1)) (setq arts (cdr arts)) (setq ref (cdr ref))) - (t ; reference article (v2) preceeds the list being filtered + (t ; reference article (v2) precedes the list being filtered (setq ref (cdr ref)))))) (while arts (gnus-agent-append-to-list tail-uncached (pop arts))) @@ -4020,7 +4020,7 @@ ;; article (with the exception of the last ID in the list - it's ;; special) that no longer appears in the overview. In this ;; situtation, the last article ID in the list implies that it, - ;; and every article ID preceeding it, have been fetched from the + ;; and every article ID preceding it, have been fetched from the ;; server. (if gnus-agent-consider-all-articles === modified file 'lisp/gnus/gnus-range.el' --- lisp/gnus/gnus-range.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/gnus-range.el 2011-02-28 01:07:29 +0000 @@ -116,10 +116,10 @@ ;; All done with range2 (setq r nil)) ((< max1 min2) - ;; No overlap: range1 preceeds range2 + ;; No overlap: range1 precedes range2 (pop r)) ((< max2 min1) - ;; No overlap: range2 preceeds range1 + ;; No overlap: range2 precedes range1 (pop range2)) ((and (<= min2 min1) (<= max1 max2)) ;; Complete overlap: range1 removed @@ -232,10 +232,10 @@ (setq range1 (cdr range1) range2 (cdr range2)) (while (and min1 min2) - (cond ((< max1 min2) ; range1 preceeds range2 + (cond ((< max1 min2) ; range1 precedes range2 (setq range1 (cdr range1) min1 nil)) - ((< max2 min1) ; range2 preceeds range1 + ((< max2 min1) ; range2 precedes range1 (setq range2 (cdr range2) min2 nil)) (t ; some sort of overlap is occurring === modified file 'lisp/gnus/gnus-start.el' --- lisp/gnus/gnus-start.el 2011-02-25 12:53:00 +0000 +++ lisp/gnus/gnus-start.el 2011-02-28 01:07:29 +0000 @@ -1513,7 +1513,7 @@ (num 0)) ;; These checks are present in gnus-activate-group but skipped - ;; due to setting dont-check in the preceeding call. + ;; due to setting dont-check in the preceding call. ;; If a cache is present, we may have to alter the active info. (when (and gnus-use-cache info) @@ -1887,7 +1887,7 @@ ;; OK - I'm done (setq articles nil)) ((< range article) - ;; this range preceeds the article. Leave the range unmodified. + ;; this range precedes the article. Leave the range unmodified. (pop ranges) ranges) ((= range article) @@ -1910,11 +1910,11 @@ (setcar ranges min) ranges) ((< max article) - ;; this range preceeds the article. Leave the range unmodified. + ;; this range precedes the article. Leave the range unmodified. (pop ranges) ranges) ((< article min) - ;; this article preceeds the range. Return null to move to the + ;; this article precedes the range. Return null to move to the ;; next article nil) (t === modified file 'lisp/gnus/nntp.el' --- lisp/gnus/nntp.el 2011-02-21 13:29:15 +0000 +++ lisp/gnus/nntp.el 2011-02-28 01:07:29 +0000 @@ -1672,7 +1672,7 @@ ;; Some nntp servers seem to have an extension to the XOVER ;; extension. On these servers, requesting an article range - ;; preceeding the active range does not return an error as + ;; preceding the active range does not return an error as ;; specified in the RFC. What we instead get is the NOV entry ;; for the first available article. Obviously, a client can ;; use that entry to avoid making unnecessary requests. The === modified file 'lisp/international/mule-cmds.el' --- lisp/international/mule-cmds.el 2011-02-19 19:40:59 +0000 +++ lisp/international/mule-cmds.el 2011-02-28 01:07:29 +0000 @@ -366,7 +366,9 @@ (coding-system-get coding-system 'ascii-compatible-p))) (setq default-file-name-coding-system coding-system))) (setq default-terminal-coding-system coding-system) - (setq default-keyboard-coding-system coding-system) + ;; Prevent default-terminal-coding-system from converting ^M to ^J. + (setq default-keyboard-coding-system + (coding-system-change-eol-conversion coding-system 'unix)) ;; Preserve eol-type from existing default-process-coding-systems. ;; On non-unix-like systems in particular, these may have been set ;; carefully by the user, or by the startup code, to deal with the === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2011-02-26 09:48:22 +0000 +++ lisp/mail/rmail.el 2011-02-28 01:07:29 +0000 @@ -503,7 +503,7 @@ \"subject\" or \"from\". A FIELD of \"to\" will automatically include all text from the \"cc\" field as well. -REGEXP is an expression to match in the preceeding specified FIELD. +REGEXP is an expression to match in the preceding specified FIELD. FIELD/REGEXP pairs continue in the list. examples: === modified file 'lisp/net/tramp-gvfs.el' --- lisp/net/tramp-gvfs.el 2011-02-05 09:52:07 +0000 +++ lisp/net/tramp-gvfs.el 2011-02-28 01:07:29 +0000 @@ -142,7 +142,7 @@ (add-to-list 'tramp-methods (cons elt nil))))) (defconst tramp-gvfs-path-tramp (concat dbus-path-emacs "/Tramp") - "The preceeding object path for own objects.") + "The preceding object path for own objects.") (defconst tramp-gvfs-service-daemon "org.gtk.vfs.Daemon" "The well known name of the GVFS daemon.") === modified file 'lisp/obsolete/sym-comp.el' --- lisp/obsolete/sym-comp.el 2011-01-25 04:08:28 +0000 +++ lisp/obsolete/sym-comp.el 2011-02-28 01:07:29 +0000 @@ -51,7 +51,7 @@ point." (save-restriction ;; Narrow in case point is in the middle of a symbol -- we want - ;; just the preceeding part. + ;; just the preceding part. (narrow-to-region (point-min) (point)) (current-word))) === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-02-10 16:56:00 +0000 +++ lisp/org/ChangeLog 2011-02-28 01:07:29 +0000 @@ -1,3 +1,14 @@ +2011-02-28 Juanma Barranquero + + * org.el (org-maybe-keyword-time-regexp): + * org-icalendar.el (org-icalendar-store-UID): + * org-agenda.el (org-agenda-scheduled-leaders) + (org-agenda-deadline-leaders, org-agenda-filter-preset): + * org-table.el (org-table-current-line-types) + (org-table-current-begin-line, org-table-current-begin-pos): + (org-table-current-field-formula): + Fix typos in docstrings. + 2011-02-10 Stefan Monnier * org-remember.el (org-remember-mode-map): === modified file 'lisp/progmodes/cperl-mode.el' --- lisp/progmodes/cperl-mode.el 2011-01-25 04:08:28 +0000 +++ lisp/progmodes/cperl-mode.el 2011-02-28 01:07:29 +0000 @@ -2769,7 +2769,7 @@ (goto-char (cperl-beginning-of-property p look-prop)) (beginning-of-line) (setq pre-indent-point (point))))) - (goto-char pre-indent-point) ; Orig line skipping preceeding pod/etc + (goto-char pre-indent-point) ; Orig line skipping preceding pod/etc (let* ((case-fold-search nil) (s-s (cperl-get-state (car parse-data) (nth 1 parse-data))) (start (or (nth 2 parse-data) ; last complete sexp terminated @@ -2796,8 +2796,8 @@ (cperl-1+ char-after-pos) 'indentable) p (1+ (cperl-beginning-of-property (point) 'indentable)) - is-block ; misused for: preceeding line in REx - (save-excursion ; Find preceeding line + is-block ; misused for: preceding line in REx + (save-excursion ; Find preceding line (cperl-backward-to-noncomment p) (beginning-of-line) (if (<= (point) p) @@ -2813,10 +2813,10 @@ prop (parse-partial-sexp p char-after-pos)) (cond ((not delim) ; End the REx, ignore is-block (vector 'indentable 'terminator p is-block)) - (is-block ; Indent w.r.t. preceeding line + (is-block ; Indent w.r.t. preceding line (vector 'indentable 'cont-line char-after-pos is-block char-after p)) - (t ; No preceeding line... + (t ; No preceding line... (vector 'indentable 'first-line p)))) ((get-text-property char-after-pos 'REx-part2) (vector 'REx-part2 (point))) @@ -2897,7 +2897,7 @@ (cperl-backward-to-start-of-continued-exp containing-sexp)) (beginning-of-line) (cperl-backward-to-noncomment containing-sexp)) - ;; Now we get non-label preceeding the indent point + ;; Now we get non-label preceding the indent point (if (not (or (eq (1- (point)) containing-sexp) (memq (preceding-char) (append (if is-block " ;{" " ,;{") '(nil))) @@ -4835,7 +4835,7 @@ ;;; Moreover, one takes positive approach (looks for else,grep etc) ;;; another negative (looks for bless,tr etc) (defun cperl-after-block-p (lim &optional pre-block) - "Return true if the preceeding } (if PRE-BLOCK, following {) delimits a block. + "Return true if the preceding } (if PRE-BLOCK, following {) delimits a block. Would not look before LIM. Assumes that LIM is a good place to begin a statement. The kind of block we treat here is one after which a new statement would start; thus the block in ${func()} does not count." @@ -4864,7 +4864,7 @@ (progn (forward-sexp -1) (looking-at "sub[ \t\n\f#]")))))) - ;; What preceeds is not word... XXXX Last statement in sub??? + ;; What precedes is not word... XXXX Last statement in sub??? (cperl-after-expr-p lim)))) (error nil)))) === modified file 'lisp/progmodes/idlwave.el' --- lisp/progmodes/idlwave.el 2011-02-10 16:56:00 +0000 +++ lisp/progmodes/idlwave.el 2011-02-28 01:07:29 +0000 @@ -428,7 +428,7 @@ variable can be set to specify the paths where IDLWAVE can find PRO files. The shell will only be asked for a list of paths when this variable is nil. The value is a list of directories. A directory -preceeded by a `+' will be searched recursively. If you set this +preceded by a `+' will be searched recursively. If you set this variable on a UNIX system, the shell will not be queried. See also `idlwave-system-directory'." :group 'idlwave-routine-info @@ -1197,7 +1197,7 @@ (2 font-lock-function-name-face))) ;; Keyword parameters, like /xlog or ,xrange=[] - ;; This is anchored to the comma preceeding the keyword. + ;; This is anchored to the comma preceding the keyword. ;; Treats continuation lines, works only during whole buffer ;; fontification. Slow, use it only in fancy fontification. (keyword-parameters === modified file 'lisp/progmodes/vhdl-mode.el' --- lisp/progmodes/vhdl-mode.el 2011-01-26 08:36:39 +0000 +++ lisp/progmodes/vhdl-mode.el 2011-02-28 01:07:29 +0000 @@ -1775,7 +1775,7 @@ (defcustom vhdl-intelligent-tab t "*Non-nil means `TAB' does indentation, word completion and tab insertion. -That is, if preceeding character is part of a word then complete word, +That is, if preceding character is part of a word then complete word, else if not at beginning of line then insert tab, else if last command was a `TAB' or `RET' then dedent one step, else indent current line (i.e. `TAB' is bound to `vhdl-electric-tab'). @@ -6946,7 +6946,7 @@ ;; Indentation commands (defun vhdl-electric-tab (&optional prefix-arg) - "If preceeding character is part of a word or a paren then hippie-expand, + "If preceding character is part of a word or a paren then hippie-expand, else if right of non whitespace on line then insert tab, else if last command was a tab or return then dedent one step or if a comment toggle between normal indent and inline comment indent, @@ -10396,7 +10396,7 @@ (if vhdl-upper-case-keywords (upcase-word num) (downcase-word num))) (defun vhdl-minibuffer-tab (&optional prefix-arg) - "If preceeding character is part of a word or a paren then hippie-expand, + "If preceding character is part of a word or a paren then hippie-expand, else insert tab (used for word completion in VHDL minibuffer)." (interactive "P") (cond @@ -13056,7 +13056,7 @@ ;; Scan functions (defun vhdl-scan-context-clause () - "Scan the context clause that preceeds a design unit." + "Scan the context clause that precedes a design unit." (let (lib-alist) (save-excursion (when (re-search-backward "^[ \t]*\\(architecture\\|configuration\\|entity\\|package\\)\\>" nil t) === modified file 'lisp/replace.el' --- lisp/replace.el 2011-02-10 16:56:00 +0000 +++ lisp/replace.el 2011-02-28 01:07:29 +0000 @@ -1531,7 +1531,7 @@ #& (string-to-number (match-string 0)) # replace-count -Note that these symbols must be preceeded by a backslash in order to +Note that these symbols must be preceded by a backslash in order to type them using Lisp syntax." (while (consp n) (cond === modified file 'lisp/textmodes/paragraphs.el' --- lisp/textmodes/paragraphs.el 2011-01-25 04:08:28 +0000 +++ lisp/textmodes/paragraphs.el 2011-02-28 01:07:29 +0000 @@ -43,7 +43,7 @@ Prefix argument says to turn mode on if positive, off if negative. When the mode is turned on, if there are newlines in the buffer but no hard -newlines, ask the user whether to mark as hard any newlines preceeding a +newlines, ask the user whether to mark as hard any newlines preceding a `paragraph-start' line. From a program, second arg INSERT specifies whether to do this; it can be `never' to change nothing, t or `always' to force marking, `guess' to try to do the right thing with no questions, nil === modified file 'src/ChangeLog.10' --- src/ChangeLog.10 2011-01-25 04:08:28 +0000 +++ src/ChangeLog.10 2011-02-28 01:07:29 +0000 @@ -20002,7 +20002,7 @@ * w32reg.c (w32_get_rdb_resource): New function. (x_get_string_resource): Use it, so resources passed with -xrm - supercede the ones in the registry. + supersede the ones in the registry. 2003-03-04 Jan Djärv @@ -25474,7 +25474,7 @@ recursive call unless that arg is non-nil. (where_is_internal): New argument no_remap. Callers changed. Call recursively to find original key bindings for a remapped - comand unless that arg is non-nil. + command unless that arg is non-nil. (Fwhere_is_internal): New optional argument NO-REMAP. Doc updated. Callers changed. Pass arg to where_is_internal. === modified file 'src/ChangeLog.3' --- src/ChangeLog.3 2011-01-26 08:36:39 +0000 +++ src/ChangeLog.3 2011-02-28 01:07:29 +0000 @@ -7023,7 +7023,7 @@ * fileio.c: There are two versions of Fexpand_file_name defined here; the latter is inside a `#if 0' clause. Change its DEFUN to a DEAFUN, so that its docstring doesn't make it into the DOC file - and supercede the real docstring. + and supersede the real docstring. * callint.c (Fcall_interactively): For the 'K' interactive spec, set varies[i] to -1, indicating that the mouse click should be @@ -11142,7 +11142,7 @@ wait_reading_process_input, instead of just the first two. * process.c (wait_reading_process_input): Remove support for - only waiting for mouse input, since that has been superceded. + only waiting for mouse input, since that has been superseded. This removes X dependencies from process.c, and eliminates some references to code that should only exist when using X10. @@ -11450,7 +11450,7 @@ * minibuf.c (temp_echo_area_glyphs): Clear echo_area_glyphs and previous_echo_glyphs, so the message we're displaying will - supercede any existing message. + supersede any existing message. * keyboard.c: Removed external declaration of echo_area_glyphs, since it's declared in window.h. === modified file 'src/character.c' --- src/character.c 2011-02-16 15:02:50 +0000 +++ src/character.c 2011-02-28 01:07:29 +0000 @@ -761,7 +761,7 @@ corresponding byte and store in DST. CHARS is the number of characters in SRC. The value is the number of bytes stored in DST. Usually, the value is the same as CHARS, but is less than it if SRC - contains a non-ASCII, non-eight-bit characater. If ACCEPT_LATIN_1 + contains a non-ASCII, non-eight-bit character. If ACCEPT_LATIN_1 is nonzero, a Latin-1 character is accepted and converted to a byte of that character code. Note: Currently the arg ACCEPT_LATIN_1 is not used. */ === modified file 'src/editfns.c' --- src/editfns.c 2011-02-16 15:02:50 +0000 +++ src/editfns.c 2011-02-28 01:07:29 +0000 @@ -3523,7 +3523,7 @@ int maybe_combine_byte; char *this_format; /* Precision for each spec, or -1, a flag value meaning no precision - was given in that spec. Element 0, corresonding to the format + was given in that spec. Element 0, corresponding to the format string itself, will not be used. Element NARGS, corresponding to no argument, *will* be assigned to in the case that a `%' and `.' occur after the final format specifier. */ === modified file 'src/keymap.c' --- src/keymap.c 2011-02-16 16:35:16 +0000 +++ src/keymap.c 2011-02-28 01:07:29 +0000 @@ -2756,7 +2756,7 @@ && !NILP (firstonly) && !NILP (tem = Fget (definition, QCadvertised_binding))) { - /* We have a list of advertized bindings. */ + /* We have a list of advertised bindings. */ while (CONSP (tem)) if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil, 0), definition)) return XCAR (tem); === modified file 'src/w32proc.c' --- src/w32proc.c 2011-01-25 04:08:28 +0000 +++ src/w32proc.c 2011-02-28 01:07:29 +0000 @@ -831,7 +831,7 @@ Note that using backslash to escape embedded quotes requires additional special handling if an embedded quote is already - preceeded by backslash, or if an arg requiring quoting ends with + preceded by backslash, or if an arg requiring quoting ends with backslash. In such cases, the run of escape characters needs to be doubled. For consistency, we apply this special handling as long as the escape character is not quote. === modified file 'src/w32term.c' --- src/w32term.c 2011-02-16 18:39:46 +0000 +++ src/w32term.c 2011-02-28 01:07:29 +0000 @@ -5941,7 +5941,7 @@ } -/* Create an xrdb-style database of resources to supercede registry settings. +/* Create an xrdb-style database of resources to supersede registry settings. The database is just a concatenation of C strings, finished by an additional \0. The strings are submitted to some basic normalization, so ------------------------------------------------------------ revno: 103444 committer: Chong Yidong branch nick: trunk timestamp: Sun 2011-02-27 18:53:41 -0500 message: * lisp/facemenu.el (list-colors-display): Use with-help-window (Bug#8048). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-27 21:26:22 +0000 +++ lisp/ChangeLog 2011-02-27 23:53:41 +0000 @@ -1,3 +1,7 @@ +2011-02-27 Chong Yidong + + * facemenu.el (list-colors-display): Use with-help-window (Bug#8048). + 2011-02-27 Prestoo Ten * term/screen.el: New file (Bug#2650). === modified file 'lisp/facemenu.el' --- lisp/facemenu.el 2011-02-21 06:03:36 +0000 +++ lisp/facemenu.el 2011-02-27 23:53:41 +0000 @@ -562,17 +562,23 @@ (let ((lc (nthcdr (1- (display-color-cells)) list))) (if lc (setcdr lc nil))))) - (let ((buf (get-buffer-create "*Colors*"))) - (with-current-buffer buf + (unless buffer-name + (setq buffer-name "*Colors*")) + (with-help-window buffer-name + (with-current-buffer standard-output (erase-buffer) - (setq truncate-lines t) - ;; Display buffer before generating content to allow - ;; `list-colors-print' to get the right window-width. + (setq truncate-lines t))) + (let ((buf (get-buffer buffer-name)) + (inhibit-read-only t)) + ;; Display buffer before generating content, to allow + ;; `list-colors-print' to get the right window-width. + (with-selected-window (or (get-buffer-window buf t) (selected-window)) + (with-current-buffer buf + (list-colors-print list callback) + (set-buffer-modified-p nil))) + (when callback (pop-to-buffer buf) - (list-colors-print list callback) - (set-buffer-modified-p nil))) - (if callback - (message "Click on a color to select it."))) + (message "Click on a color to select it.")))) (defun list-colors-print (list &optional callback) (let ((callback-fn ------------------------------------------------------------ revno: 103443 committer: Chong Yidong branch nick: trunk timestamp: Sun 2011-02-27 17:57:22 -0500 message: Avoid recording dead buffers in buffer-list frame param (Bug#7898). * src/frame.c (store_frame_param): Don't store value directly in buffer_list and buried_buffer_list; copy the list and remove dead buffers. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-02-27 19:51:35 +0000 +++ src/ChangeLog 2011-02-27 22:57:22 +0000 @@ -1,3 +1,9 @@ +2011-02-27 Chong Yidong + + * frame.c (store_frame_param): Don't store value directly in + buffer_list and buried_buffer_list; copy the list and remove dead + buffers (Bug#7898). + 2011-02-27 Eli Zaretskii * msdos.c (readlink) [DJGPP < 2.04]: New stub function. === modified file 'src/frame.c' --- src/frame.c 2011-02-27 07:47:34 +0000 +++ src/frame.c 2011-02-27 22:57:22 +0000 @@ -2208,15 +2208,23 @@ register Lisp_Object old_alist_elt; /* The buffer-list parameters are stored in a special place and not - in the alist. */ + in the alist. All buffers must be live. */ if (EQ (prop, Qbuffer_list)) { - f->buffer_list = val; + Lisp_Object list = Qnil; + for (; CONSP (val); val = XCDR (val)) + if (!NILP (Fbuffer_live_p (XCAR (val)))) + list = Fcons (XCAR (val), list); + f->buffer_list = Fnreverse (list); return; } if (EQ (prop, Qburied_buffer_list)) { - f->buried_buffer_list = val; + Lisp_Object list = Qnil; + for (; CONSP (val); val = XCDR (val)) + if (!NILP (Fbuffer_live_p (XCAR (val)))) + list = Fcons (XCAR (val), list); + f->buried_buffer_list = Fnreverse (list); return; } ------------------------------------------------------------ revno: 103442 committer: Chong Yidong branch nick: trunk timestamp: Sun 2011-02-27 17:10:48 -0500 message: * minibuf.texi: Clarify history list discussion (Bug#8085). diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-02-19 19:40:59 +0000 +++ doc/lispref/ChangeLog 2011-02-27 22:10:48 +0000 @@ -1,3 +1,8 @@ +2011-02-27 Chong Yidong + + * minibuf.texi (Minibuffer History): Clarify discussion of + minibuffer history lists (Bug#8085). + 2011-02-19 Eli Zaretskii * elisp.texi: Sync @dircategory with ../../info/dir. === modified file 'doc/lispref/minibuf.texi' --- doc/lispref/minibuf.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/minibuf.texi 2011-02-27 22:10:48 +0000 @@ -433,18 +433,17 @@ @cindex minibuffer history @cindex history list - A @dfn{minibuffer history list} records previous minibuffer inputs so -the user can reuse them conveniently. A history list is actually a -symbol, not a list; it is a variable whose value is a list of strings -(previous inputs), most recent first. - - There are many separate history lists, used for different kinds of -inputs. It's the Lisp programmer's job to specify the right history -list for each use of the minibuffer. - - You specify the history list with the optional @var{hist} argument -to either @code{read-from-minibuffer} or @code{completing-read}. Here -are the possible values for it: + A @dfn{minibuffer history list} records previous minibuffer inputs +so the user can reuse them conveniently. It is a variable whose value +is a list of strings (previous inputs), most recent first. + + There are many separate minibuffer history lists, used for different +kinds of inputs. It's the Lisp programmer's job to specify the right +history list for each use of the minibuffer. + + You specify a minibuffer history list with the optional @var{hist} +argument to @code{read-from-minibuffer} or @code{completing-read}. +Here are the possible values for it: @table @asis @item @var{variable} ------------------------------------------------------------ revno: 103441 author: Prestoo Ten committer: Chong Yidong branch nick: trunk timestamp: Sun 2011-02-27 16:26:22 -0500 message: * term/screen.el: New file (Bug#2650). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-27 02:50:38 +0000 +++ lisp/ChangeLog 2011-02-27 21:26:22 +0000 @@ -1,3 +1,7 @@ +2011-02-27 Prestoo Ten + + * term/screen.el: New file (Bug#2650). + 2011-02-27 Stefan Monnier * emacs-lisp/pcase.el (pcase--if): Try to invert test to reduce depth. === added file 'lisp/term/screen.el' --- lisp/term/screen.el 1970-01-01 00:00:00 +0000 +++ lisp/term/screen.el 2011-02-27 21:26:22 +0000 @@ -0,0 +1,11 @@ +;; -*- no-byte-compile: t -*- +;; Treat a screen terminal similar to an xterm. +(load "term/xterm") + +(defun terminal-init-screen () + "Terminal initialization function for screen." + ;; Use the xterm color initialization code. + (xterm-register-default-colors) + (tty-set-up-initial-frame-faces)) + +;; screen.el ends here ------------------------------------------------------------ revno: 103440 committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-02-27 11:55:44 -0800 message: * INSTALL.BZR: Tweak previous change. diff: === modified file 'INSTALL.BZR' --- INSTALL.BZR 2011-02-27 19:36:45 +0000 +++ INSTALL.BZR 2011-02-27 19:55:44 +0000 @@ -9,9 +9,9 @@ $ ./configure -(Note that normally there is no need to run `autoconf' etc. If you -need it, the relevant command is `autoreconf -I m4'. Be aware that -this will likely lead to conflicts next time you update from Bazaar.) +(Normally there is no need to run `autoconf' etc. If you do need it, +the relevant command is `autoreconf -I m4'. Be aware that this will +likely lead to conflicts next time you update from Bazaar.) Some of the files that are included in the Emacs tarball, such as byte-compiled Lisp files, are not stored in Bazaar. Therefore, to ------------------------------------------------------------ revno: 103439 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2011-02-27 21:51:35 +0200 message: Implement stub emulation of `readlink' for MS-DOS. src/msdos.c (readlink) [DJGPP < 2.04]: New stub function. src/msdos.h: (readlink) [DJGPP < 2.04]: Declare prototype. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-02-27 19:48:31 +0000 +++ src/ChangeLog 2011-02-27 19:51:35 +0000 @@ -1,5 +1,9 @@ 2011-02-27 Eli Zaretskii + * msdos.c (readlink) [DJGPP < 2.04]: New stub function. + + * msdos.h: (readlink) [DJGPP < 2.04]: Declare prototype. + * w32.c (symlink, readlink): New stub functions. 2011-02-27 Paul Eggert === modified file 'src/msdos.c' --- src/msdos.c 2011-02-27 07:30:02 +0000 +++ src/msdos.c 2011-02-27 19:51:35 +0000 @@ -3920,6 +3920,18 @@ */ int setpgrp (void) {return 0; } int setpriority (int x, int y, int z) { return 0; } + +#if __DJGPP__ == 2 && __DJGPP_MINOR__ < 4 +ssize_t +readlink (const char *name, char *dummy1, size_t dummy2) +{ + /* `access' is much faster than `stat' on MS-DOS. */ + if (access (name, F_OK) == 0) + errno = EINVAL; + return -1; +} +#endif + #if __DJGPP__ == 2 && __DJGPP_MINOR__ < 2 === modified file 'src/msdos.h' --- src/msdos.h 2011-01-25 04:08:28 +0000 +++ src/msdos.h 2011-02-27 19:46:39 +0000 @@ -40,6 +40,11 @@ void mouse_on (void); void mouse_off (void); void mouse_moveto (int, int); + +#if __DJGPP__ == 2 && __DJGPP_MINOR__ < 4 +int readlink (const char *, char *, size_t); +#endif + #ifndef HAVE_X_WINDOWS /* Dummy types. */ ------------------------------------------------------------ revno: 103438 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2011-02-27 21:48:31 +0200 message: Implement stubs of `readlink' and `symlink' for MS-Windows. src/w32.c (symlink, readlink): New stub functions. nt/inc/unistd.h (readlink, symlink): Declare prototypes. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2011-02-26 14:02:45 +0000 +++ nt/ChangeLog 2011-02-27 19:48:31 +0000 @@ -1,3 +1,7 @@ +2011-02-27 Eli Zaretskii + + * inc/unistd.h (readlink, symlink): Declare prototypes. + 2011-02-26 Eli Zaretskii * config.nt (nlink_t): Define. === modified file 'nt/inc/unistd.h' --- nt/inc/unistd.h 2011-01-15 23:16:57 +0000 +++ nt/inc/unistd.h 2011-02-27 19:48:31 +0000 @@ -1,2 +1,10 @@ /* Fake unistd.h: config.h already provides most of the relevant things. */ +#ifndef _UNISTD_H +#define _UNISTD_H + +extern ssize_t readlink (const char *, char *, size_t); +extern int symlink (char const *, char const *); + +#endif /* _UNISTD_H */ + === modified file 'src/ChangeLog' --- src/ChangeLog 2011-02-27 07:50:33 +0000 +++ src/ChangeLog 2011-02-27 19:48:31 +0000 @@ -1,3 +1,7 @@ +2011-02-27 Eli Zaretskii + + * w32.c (symlink, readlink): New stub functions. + 2011-02-27 Paul Eggert * scroll.c (CHECK_BOUNDS): #define only if GLYPH_DEBUG. === modified file 'src/w32.c' --- src/w32.c 2011-01-25 04:08:28 +0000 +++ src/w32.c 2011-02-27 19:48:31 +0000 @@ -3614,6 +3614,25 @@ } +/* Symlink-related functions that always fail. Used in fileio.c to + avoid #ifdef's. */ +int +symlink (char const *dummy1, char const *dummy2) +{ + errno = ENOSYS; + return -1; +} + +ssize_t +readlink (const char *name, char *dummy1, size_t dummy2) +{ + /* `access' is much faster than `stat' on MS-Windows. */ + if (sys_access (name, 0) == 0) + errno = EINVAL; + return -1; +} + + /* Support for browsing other processes and their attributes. See process.c for the Lisp bindings. */ ------------------------------------------------------------ revno: 103437 committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-02-27 11:36:45 -0800 message: * INSTALL.BZR: Mention autoreconf. diff: === modified file 'INSTALL.BZR' --- INSTALL.BZR 2011-01-26 08:36:39 +0000 +++ INSTALL.BZR 2011-02-27 19:36:45 +0000 @@ -9,6 +9,10 @@ $ ./configure +(Note that normally there is no need to run `autoconf' etc. If you +need it, the relevant command is `autoreconf -I m4'. Be aware that +this will likely lead to conflicts next time you update from Bazaar.) + Some of the files that are included in the Emacs tarball, such as byte-compiled Lisp files, are not stored in Bazaar. Therefore, to build from Bazaar you must run "make bootstrap" instead of just "make": ------------------------------------------------------------ revno: 103436 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2011-02-27 08:20:21 +0000 message: gnus-group.el (gnus-import-other-newsrc-file): New function. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-02-25 23:52:19 +0000 +++ lisp/gnus/ChangeLog 2011-02-27 08:20:21 +0000 @@ -1,3 +1,7 @@ +2011-02-27 Lars Magne Ingebrigtsen + + * gnus-group.el (gnus-import-other-newsrc-file): New function. + 2011-02-25 Teodor Zlatanov * auth-source.el (auth-source-search): Cache empty result sets. === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2011-01-31 02:19:13 +0000 +++ lisp/gnus/gnus-group.el 2011-02-27 08:20:21 +0000 @@ -4400,6 +4400,21 @@ (defun gnus-group-set-params-info (group params) (gnus-group-set-info params group 'params)) +;; Ad-hoc function for inserting data from a different newsrc.eld +;; file. Use with caution, if at all. +(defun gnus-import-other-newsrc-file (file) + (with-temp-buffer + (insert-file file) + (let (form) + (while (ignore-errors + (setq form (read (current-buffer)))) + (when (and (consp form) + (eq (cadr form) 'gnus-newsrc-alist)) + (let ((infos (cadr (nth 2 form)))) + (dolist (info infos) + (when (gnus-get-info (car info)) + (gnus-set-info (car info) info))))))))) + (defun gnus-add-marked-articles (group type articles &optional info force) ;; Add ARTICLES of TYPE to the info of GROUP. ;; If INFO is non-nil, use that info. If FORCE is non-nil, don't === modified file 'lisp/gnus/gnus.el' --- lisp/gnus/gnus.el 2011-02-19 19:40:59 +0000 +++ lisp/gnus/gnus.el 2011-02-27 08:20:21 +0000 @@ -3114,6 +3114,10 @@ (defmacro gnus-get-info (group) `(nth 2 (gnus-gethash ,group gnus-newsrc-hashtb))) +(defun gnus-set-info (group info) + (setcar (nthcdr 2 (gnus-gethash group gnus-newsrc-hashtb)) + info)) + ;;; Load the compatibility functions. (require 'gnus-ems) ------------------------------------------------------------ revno: 103435 [merge] committer: Paul Eggert branch nick: trunk timestamp: Sat 2011-02-26 23:57:49 -0800 message: Merge: Minor cleanups uncovered by gcc warnings diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-02-26 12:55:10 +0000 +++ src/ChangeLog 2011-02-27 07:50:33 +0000 @@ -1,3 +1,36 @@ +2011-02-27 Paul Eggert + + * scroll.c (CHECK_BOUNDS): #define only if GLYPH_DEBUG. + This avoids a gcc warning in some configurations. + + * frame.c (x_set_screen_gamma): Rename local to avoid shadowing. + + * frame.h: Avoid gcc -Wmissing-prototypes diagnostics. + (set_menu_bar_lines, x_get_resource_string): New decls. + * msdos.c (set_menu_bar_lines): Omit decl. + + * dispextern.h (struct glyph): Make u.img_id int, not unsigned. + It's always given int values and used as an int. This suppresses + a gcc "comparison of unsigned expression >= 0" warning in some + configurations. + + * dispnew.c: Rename locals to avoid shadowing. + (update_text_area, scrolling_window, update_frame_1): Rename locals. + +2011-02-26 Paul Eggert + + * dispnew.c: Fix problems uncovered by gcc -Wstrict-prototypes. + (copy_glyph_row_contents): Remove; not used. + (frame_row_to_window, check_current_matrix_flags): + (window_change_signal): Now static, since they're not used elsewhere. + (check_current_matrix_flags): Surround with "#if 0", since its + only use is in a comment. Maybe both the comment and the "#if 0" + stuff should be removed? + + * dispnew.c: Fix problem uncovered by gcc -Wunused-variable. + (adjust_frame_glyphs_for_window_redisplay): Make 'w' local to the + contexts that actually need it. + 2011-02-26 Eli Zaretskii * s/msdos.h (HAVE_LSTAT): Define for DJGPP >= 2.04. === modified file 'src/dispextern.h' --- src/dispextern.h 2011-02-16 15:02:50 +0000 +++ src/dispextern.h 2011-02-27 02:41:48 +0000 @@ -431,7 +431,7 @@ } cmp; /* Image ID for image glyphs (type == IMAGE_GLYPH). */ - unsigned img_id; + int img_id; /* Sub-structure for type == STRETCH_GLYPH. */ struct === modified file 'src/dispnew.c' --- src/dispnew.c 2011-02-16 15:02:50 +0000 +++ src/dispnew.c 2011-02-27 00:48:14 +0000 @@ -1129,32 +1129,6 @@ } -/* Copy contents of glyph row FROM to glyph row TO. Glyph pointers in - TO and FROM are left unchanged. Glyph contents are copied from the - glyph memory of FROM to the glyph memory of TO. Increment buffer - positions in row TO by DELTA/ DELTA_BYTES. */ - -void -copy_glyph_row_contents (struct glyph_row *to, struct glyph_row *from, - EMACS_INT delta, EMACS_INT delta_bytes) -{ - int area; - - /* This is like a structure assignment TO = FROM, except that - glyph pointers in the rows are left unchanged. */ - copy_row_except_pointers (to, from); - - /* Copy glyphs from FROM to TO. */ - for (area = 0; area < LAST_AREA; ++area) - if (from->used[area]) - memcpy (to->glyphs[area], from->glyphs[area], - from->used[area] * sizeof (struct glyph)); - - /* Increment buffer positions in TO by DELTA. */ - increment_row_positions (to, delta, delta_bytes); -} - - /* Assign glyph row FROM to glyph row TO. This works like a structure assignment TO = FROM, except that glyph pointers are not copied but exchanged between TO and FROM. Pointers must be exchanged to avoid @@ -2223,8 +2197,6 @@ static void adjust_frame_glyphs_for_window_redisplay (struct frame *f) { - struct window *w; - xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f)); /* Allocate/reallocate window matrices. */ @@ -2236,6 +2208,7 @@ #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) { /* Allocate a dummy window if not already done. */ + struct window *w; if (NILP (f->menu_bar_window)) { f->menu_bar_window = make_window (); @@ -2258,23 +2231,26 @@ #endif /* HAVE_X_WINDOWS */ #ifndef USE_GTK - /* Allocate/ reallocate matrices of the tool bar window. If we - don't have a tool bar window yet, make one. */ - if (NILP (f->tool_bar_window)) - { - f->tool_bar_window = make_window (); + { + /* Allocate/ reallocate matrices of the tool bar window. If we + don't have a tool bar window yet, make one. */ + struct window *w; + if (NILP (f->tool_bar_window)) + { + f->tool_bar_window = make_window (); + w = XWINDOW (f->tool_bar_window); + XSETFRAME (w->frame, f); + w->pseudo_window_p = 1; + } + else w = XWINDOW (f->tool_bar_window); - XSETFRAME (w->frame, f); - w->pseudo_window_p = 1; - } - else - w = XWINDOW (f->tool_bar_window); - XSETFASTINT (w->top_line, FRAME_MENU_BAR_LINES (f)); - XSETFASTINT (w->left_col, 0); - XSETFASTINT (w->total_lines, FRAME_TOOL_BAR_LINES (f)); - XSETFASTINT (w->total_cols, FRAME_TOTAL_COLS (f)); - allocate_matrices_for_window_redisplay (w); + XSETFASTINT (w->top_line, FRAME_MENU_BAR_LINES (f)); + XSETFASTINT (w->left_col, 0); + XSETFASTINT (w->total_lines, FRAME_TOOL_BAR_LINES (f)); + XSETFASTINT (w->total_cols, FRAME_TOTAL_COLS (f)); + allocate_matrices_for_window_redisplay (w); + } #endif } @@ -2924,7 +2900,7 @@ /* Return the window in the window tree rooted in W containing frame row ROW. Value is null if none is found. */ -struct window * +static struct window * frame_row_to_window (struct window *w, int row) { struct window *found = NULL; @@ -3562,12 +3538,12 @@ #endif /* HAVE_WINDOW_SYSTEM */ -#ifdef GLYPH_DEBUG +#if defined GLYPH_DEBUG && 0 /* Check that no row in the current matrix of window W is enabled which is below what's displayed in the window. */ -void +static void check_current_matrix_flags (struct window *w) { int last_seen_p = 0; @@ -4014,7 +3990,7 @@ { /* Otherwise clear to the end of the old row. Everything after that position should be clear already. */ - int x; + int xlim; if (i >= desired_row->used[TEXT_AREA]) rif->cursor_to (vpos, i, desired_row->y, @@ -4031,11 +4007,11 @@ : (w->phys_cursor.hpos >= desired_row->used[TEXT_AREA]))) { w->phys_cursor_on_p = 0; - x = -1; + xlim = -1; } else - x = current_row->pixel_width; - rif->clear_end_of_line (x); + xlim = current_row->pixel_width; + rif->clear_end_of_line (xlim); changed_p = 1; } } @@ -4491,7 +4467,7 @@ && old_lines[i]->old_uses == 1 && old_lines[i]->new_uses == 1) { - int j, k; + int p, q; int new_line = old_lines[i]->new_line_number; struct run *run = run_pool + run_idx++; @@ -4504,33 +4480,33 @@ run->height = MATRIX_ROW (current_matrix, i)->height; /* Extend backward. */ - j = i - 1; - k = new_line - 1; - while (j > first_old - && k > first_new - && old_lines[j] == new_lines[k]) + p = i - 1; + q = new_line - 1; + while (p > first_old + && q > first_new + && old_lines[p] == new_lines[q]) { - int h = MATRIX_ROW (current_matrix, j)->height; + int h = MATRIX_ROW (current_matrix, p)->height; --run->current_vpos; --run->desired_vpos; ++run->nrows; run->height += h; run->desired_y -= h; run->current_y -= h; - --j, --k; + --p, --q; } /* Extend forward. */ - j = i + 1; - k = new_line + 1; - while (j < last_old - && k < last_new - && old_lines[j] == new_lines[k]) + p = i + 1; + q = new_line + 1; + while (p < last_old + && q < last_new + && old_lines[p] == new_lines[q]) { - int h = MATRIX_ROW (current_matrix, j)->height; + int h = MATRIX_ROW (current_matrix, p)->height; ++run->nrows; run->height += h; - ++j, ++k; + ++p, ++q; } /* Insert run into list of all runs. Order runs by copied @@ -4538,11 +4514,11 @@ be copied because they are already in place. This is done because we can avoid calling update_window_line in this case. */ - for (j = 0; j < nruns && runs[j]->height > run->height; ++j) + for (p = 0; p < nruns && runs[p]->height > run->height; ++p) ; - for (k = nruns; k > j; --k) - runs[k] = runs[k - 1]; - runs[j] = run; + for (q = nruns; q > p; --q) + runs[q] = runs[q - 1]; + runs[p] = run; ++nruns; i += run->nrows; @@ -4639,7 +4615,7 @@ struct glyph_matrix *current_matrix = f->current_matrix; struct glyph_matrix *desired_matrix = f->desired_matrix; int i; - int pause; + int pause_p; int preempt_count = baud_rate / 2400 + 1; xassert (current_matrix && desired_matrix); @@ -4653,7 +4629,7 @@ #if !PERIODIC_PREEMPTION_CHECKING if (!force_p && detect_input_pending_ignore_squeezables ()) { - pause = 1; + pause_p = 1; goto do_pause; } #endif @@ -4733,10 +4709,10 @@ } } - pause = (i < FRAME_LINES (f) - 1) ? i : 0; + pause_p = (i < FRAME_LINES (f) - 1) ? i : 0; /* Now just clean up termcap drivers and set cursor, etc. */ - if (!pause) + if (!pause_p) { if ((cursor_in_echo_area /* If we are showing a message instead of the mini-buffer, @@ -4837,7 +4813,7 @@ #endif clear_desired_matrices (f); - return pause; + return pause_p; } @@ -5594,7 +5570,7 @@ #ifdef SIGWINCH -SIGTYPE +static SIGTYPE window_change_signal (int signalnum) /* If we don't have an argument, */ /* some compilers complain in signal calls. */ { === modified file 'src/frame.c' --- src/frame.c 2011-02-16 16:35:16 +0000 +++ src/frame.c 2011-02-27 07:47:34 +0000 @@ -3275,12 +3275,12 @@ bgcolor = Fassq (Qbackground_color, f->param_alist); if (CONSP (bgcolor) && (bgcolor = XCDR (bgcolor), STRINGP (bgcolor))) { - Lisp_Object index = Fget (Qbackground_color, Qx_frame_parameter); - if (NATNUMP (index) - && (XFASTINT (index) + Lisp_Object parm_index = Fget (Qbackground_color, Qx_frame_parameter); + if (NATNUMP (parm_index) + && (XFASTINT (parm_index) < sizeof (frame_parms)/sizeof (frame_parms[0])) - && FRAME_RIF (f)->frame_parm_handlers[XFASTINT (index)]) - (*FRAME_RIF (f)->frame_parm_handlers[XFASTINT (index)]) + && FRAME_RIF (f)->frame_parm_handlers[XFASTINT (parm_index)]) + (*FRAME_RIF (f)->frame_parm_handlers[XFASTINT (parm_index)]) (f, bgcolor, Qnil); } === modified file 'src/frame.h' --- src/frame.h 2011-01-25 04:08:28 +0000 +++ src/frame.h 2011-02-27 07:30:02 +0000 @@ -841,6 +841,7 @@ extern struct frame *last_nonminibuf_frame; +extern void set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); extern struct frame *make_initial_frame (void); extern struct frame *make_terminal_frame (struct terminal *); extern struct frame *make_frame (int); @@ -1131,17 +1132,20 @@ extern void x_set_alpha (struct frame *, Lisp_Object, Lisp_Object); extern void validate_x_resource_name (void); - + extern Lisp_Object display_x_get_resource (Display_Info *, Lisp_Object attribute, Lisp_Object class, Lisp_Object component, Lisp_Object subclass); +#if defined HAVE_X_WINDOWS && !defined USE_X_TOOLKIT +extern char *x_get_resource_string (const char *, const char *); +#endif + /* In xmenu.c */ extern void set_frame_menubar (FRAME_PTR, int, int); #endif /* HAVE_WINDOW_SYSTEM */ #endif /* not EMACS_FRAME_H */ - === modified file 'src/msdos.c' --- src/msdos.c 2011-02-16 19:09:20 +0000 +++ src/msdos.c 2011-02-27 07:30:02 +0000 @@ -1389,8 +1389,6 @@ void x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { - extern void set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); - set_menu_bar_lines (f, value, oldval); } @@ -4236,4 +4234,3 @@ } #endif /* MSDOS */ - === modified file 'src/scroll.c' --- src/scroll.c 2011-01-26 08:36:39 +0000 +++ src/scroll.c 2011-02-27 07:50:33 +0000 @@ -262,7 +262,8 @@ for (k = 0; k < window_size; ++k) copy_from[k] = -1; -#define CHECK_BOUNDS \ +#if GLYPH_DEBUG +# define CHECK_BOUNDS \ do \ { \ int k; \ @@ -271,6 +272,7 @@ || (copy_from[k] >= 0 && copy_from[k] < window_size)); \ } \ while (0); +#endif /* When j is advanced, this corresponds to deleted lines. When i is advanced, this corresponds to inserted lines. */ @@ -1035,4 +1037,3 @@ FRAME_DELETE_COST (frame), FRAME_DELETEN_COST (frame), coefficient); } - ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.