Now on revision 110586. ------------------------------------------------------------ revno: 110586 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2012-10-19 08:43:12 +0200 message: Decrease NSTATICS to 0x800. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-19 00:54:35 +0000 +++ src/ChangeLog 2012-10-19 06:43:12 +0000 @@ -1,3 +1,7 @@ +2012-10-19 Eli Zaretskii + + * alloc.c (NSTATICS): Decrease to 0x800. + 2012-10-19 Stefan Monnier * fns.c (Fnreverse): Include the problem element when signalling an === modified file 'src/alloc.c' --- src/alloc.c 2012-10-18 18:21:55 +0000 +++ src/alloc.c 2012-10-19 06:43:12 +0000 @@ -376,7 +376,7 @@ /* Addresses of staticpro'd variables. Initialize it to a nonzero value; otherwise some compilers put it into BSS. */ -#define NSTATICS 0x1000 +#define NSTATICS 0x800 static Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag}; /* Index of next unused slot in staticvec. */ ------------------------------------------------------------ revno: 110585 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12677 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2012-10-18 20:54:35 -0400 message: * src/fns.c (Fnreverse): Include the problem element when signalling an error. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-18 18:54:37 +0000 +++ src/ChangeLog 2012-10-19 00:54:35 +0000 @@ -1,3 +1,8 @@ +2012-10-19 Stefan Monnier + + * fns.c (Fnreverse): Include the problem element when signalling an + error (bug#12677). + 2012-10-18 Jan Djärv * nsterm.m (ns_select): Check writefds before call to === modified file 'src/fns.c' --- src/fns.c 2012-10-01 18:59:52 +0000 +++ src/fns.c 2012-10-19 00:54:35 +0000 @@ -1689,7 +1689,7 @@ DEFUN ("nreverse", Fnreverse, Snreverse, 1, 1, 0, doc: /* Reverse LIST by modifying cdr pointers. -Return the reversed list. */) +Return the reversed list. Expects a properly nil-terminated list. */) (Lisp_Object list) { register Lisp_Object prev, tail, next; @@ -1700,7 +1700,7 @@ while (!NILP (tail)) { QUIT; - CHECK_LIST_CONS (tail, list); + CHECK_LIST_CONS (tail, tail); next = XCDR (tail); Fsetcdr (tail, prev); prev = tail; ------------------------------------------------------------ revno: 110584 fixes bug: http://debbugs.gnu.org/12648 committer: Chong Yidong branch nick: trunk timestamp: Fri 2012-10-19 03:46:18 +0800 message: Fix how gdb-mi calls display-buffer to avoid switching frames. * lisp/progmodes/gdb-mi.el (gdb-display-buffer-other-frame-action): Convert to defcustom. (gdb-get-source-file): Don't bind pop-up-windows. * lisp/progmodes/gud.el (gud-display-line): Don't specially re-use other frames for the gdb-mi case. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-18 15:37:57 +0000 +++ lisp/ChangeLog 2012-10-18 19:46:18 +0000 @@ -1,3 +1,12 @@ +2012-10-18 Chong Yidong + + * progmodes/gdb-mi.el (gdb-display-buffer-other-frame-action): + Convert to defcustom. + (gdb-get-source-file): Don't bind pop-up-windows. + + * progmodes/gud.el (gud-display-line): Don't specially re-use + other frames for the gdb-mi case (Bug#12648). + 2012-10-18 Stefan Monnier * emacs-lisp/advice.el: Clean up commentary a bit. === modified file 'lisp/progmodes/gdb-mi.el' --- lisp/progmodes/gdb-mi.el 2012-08-26 09:16:48 +0000 +++ lisp/progmodes/gdb-mi.el 2012-10-18 19:46:18 +0000 @@ -1516,9 +1516,9 @@ (comint-exec io-buffer "gdb-inferior" nil nil nil) (gdb-inferior-io--init-proc (get-buffer-process io-buffer)))))) -(defvar gdb-display-buffer-other-frame-action - `((display-buffer-reuse-window display-buffer-pop-up-frame) - (reusable-frames . 0) +(defcustom gdb-display-buffer-other-frame-action + '((display-buffer-reuse-window display-buffer-pop-up-frame) + (reusable-frames . visible) (inhibit-same-window . t) (pop-up-frame-parameters (height . 14) (width . 80) @@ -1526,8 +1526,11 @@ (tool-bar-lines . nil) (menu-bar-lines . nil) (minibuffer . nil))) - "A `display-buffer' action for displaying GDB utility frames.") -(put 'gdb-display-buffer-other-frame-action 'risky-local-variable t) + "`display-buffer' action for displaying GDB utility frames." + :group 'gdb + :type display-buffer--action-custom-type + :risky t + :version "24.3") (defun gdb-frame-io-buffer () "Display IO of debugged program in another frame." @@ -4175,9 +4178,9 @@ (if gdb-many-windows (gdb-setup-windows) (gdb-get-buffer-create 'gdb-breakpoints-buffer) - (if (and gdb-show-main gdb-main-file) - (let ((pop-up-windows t)) - (display-buffer (gud-find-file gdb-main-file))))) + (and gdb-show-main + gdb-main-file + (display-buffer (gud-find-file gdb-main-file)))) (gdb-force-mode-line-update (propertize "ready" 'face font-lock-variable-name-face))) === modified file 'lisp/progmodes/gud.el' --- lisp/progmodes/gud.el 2012-08-26 09:16:48 +0000 +++ lisp/progmodes/gud.el 2012-10-18 19:46:18 +0000 @@ -2700,42 +2700,39 @@ (gud-find-file true-file))) (window (and buffer (or (get-buffer-window buffer) - (if (eq gud-minor-mode 'gdbmi) - (display-buffer buffer nil 'visible)) (display-buffer buffer)))) (pos)) - (if buffer - (progn - (with-current-buffer buffer - (unless (or (verify-visited-file-modtime buffer) gud-keep-buffer) - (if (yes-or-no-p - (format "File %s changed on disk. Reread from disk? " - (buffer-name))) - (revert-buffer t t) - (setq gud-keep-buffer t))) - (save-restriction - (widen) - (goto-char (point-min)) - (forward-line (1- line)) - (setq pos (point)) - (or gud-overlay-arrow-position - (setq gud-overlay-arrow-position (make-marker))) - (set-marker gud-overlay-arrow-position (point) (current-buffer)) - ;; If they turned on hl-line, move the hl-line highlight to - ;; the arrow's line. - (when (featurep 'hl-line) - (cond - (global-hl-line-mode - (global-hl-line-highlight)) - ((and hl-line-mode hl-line-sticky-flag) - (hl-line-highlight))))) - (cond ((or (< pos (point-min)) (> pos (point-max))) - (widen) - (goto-char pos)))) - (when window - (set-window-point window gud-overlay-arrow-position) - (if (eq gud-minor-mode 'gdbmi) - (setq gdb-source-window window))))))) + (when buffer + (with-current-buffer buffer + (unless (or (verify-visited-file-modtime buffer) gud-keep-buffer) + (if (yes-or-no-p + (format "File %s changed on disk. Reread from disk? " + (buffer-name))) + (revert-buffer t t) + (setq gud-keep-buffer t))) + (save-restriction + (widen) + (goto-char (point-min)) + (forward-line (1- line)) + (setq pos (point)) + (or gud-overlay-arrow-position + (setq gud-overlay-arrow-position (make-marker))) + (set-marker gud-overlay-arrow-position (point) (current-buffer)) + ;; If they turned on hl-line, move the hl-line highlight to + ;; the arrow's line. + (when (featurep 'hl-line) + (cond + (global-hl-line-mode + (global-hl-line-highlight)) + ((and hl-line-mode hl-line-sticky-flag) + (hl-line-highlight))))) + (cond ((or (< pos (point-min)) (> pos (point-max))) + (widen) + (goto-char pos)))) + (when window + (set-window-point window gud-overlay-arrow-position) + (if (eq gud-minor-mode 'gdbmi) + (setq gdb-source-window window)))))) ;; The gud-call function must do the right thing whether its invoking ;; keystroke is from the GUD buffer itself (via major-mode binding) ------------------------------------------------------------ revno: 110583 fixes bug: http://debbugs.gnu.org/12668 committer: Jan D. branch nick: trunk timestamp: Thu 2012-10-18 20:54:37 +0200 message: * nsterm.m (ns_select): Check writefds before call to FD_ISSET. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-18 17:00:08 +0000 +++ src/ChangeLog 2012-10-18 18:54:37 +0000 @@ -1,3 +1,8 @@ +2012-10-18 Jan Djärv + + * nsterm.m (ns_select): Check writefds before call to + FD_ISSET (Bug#12668). + 2012-10-18 Daniel Colascione * alloc.c (NSTATICS): Increase from 0x650 to 0x1000 === modified file 'src/nsterm.m' --- src/nsterm.m 2012-10-14 18:28:48 +0000 +++ src/nsterm.m 2012-10-18 18:54:37 +0000 @@ -3443,10 +3443,10 @@ /* NSTRACE (ns_select); */ - for (k = 0; readfds && k < nfds+1; k++) + for (k = 0; k < nfds+1; k++) { - if (FD_ISSET(k, readfds)) ++nr; - if (FD_ISSET(k, writefds)) ++nr; + if (readfds && FD_ISSET(k, readfds)) ++nr; + if (writefds && FD_ISSET(k, writefds)) ++nr; } if (NSApp == nil ------------------------------------------------------------ revno: 110582 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2012-10-18 20:21:55 +0200 message: Fix wording of error message in staticpro. diff: === modified file 'src/alloc.c' --- src/alloc.c 2012-10-18 17:00:08 +0000 +++ src/alloc.c 2012-10-18 18:21:55 +0000 @@ -5030,7 +5030,7 @@ { staticvec[staticidx++] = varaddress; if (staticidx >= NSTATICS) - fatal ("NSTATICS too small. Try increasing and recompiling Emacs."); + fatal ("NSTATICS too small; try increasing and recompiling Emacs."); } ------------------------------------------------------------ revno: 110581 committer: Daniel Colascione branch nick: cyg timestamp: Thu 2012-10-18 09:00:08 -0800 message: Increase NSTATICS; tell the user when we run out of static slots. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-18 08:27:49 +0000 +++ src/ChangeLog 2012-10-18 17:00:08 +0000 @@ -1,3 +1,9 @@ +2012-10-18 Daniel Colascione + + * alloc.c (NSTATICS): Increase from 0x650 to 0x1000 + (staticpro): If we run out of staticpro slots, die with an + informative error instead of just calling emacs_abort. + 2012-10-18 Martin Rudalics Fix two flaws reported by Dmitry Antipov. === modified file 'src/alloc.c' --- src/alloc.c 2012-10-16 07:56:44 +0000 +++ src/alloc.c 2012-10-18 17:00:08 +0000 @@ -376,7 +376,7 @@ /* Addresses of staticpro'd variables. Initialize it to a nonzero value; otherwise some compilers put it into BSS. */ -#define NSTATICS 0x650 +#define NSTATICS 0x1000 static Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag}; /* Index of next unused slot in staticvec. */ @@ -5030,7 +5030,7 @@ { staticvec[staticidx++] = varaddress; if (staticidx >= NSTATICS) - emacs_abort (); + fatal ("NSTATICS too small. Try increasing and recompiling Emacs."); } ------------------------------------------------------------ revno: 110580 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12669 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2012-10-18 11:51:28 -0400 message: * lisp/erc/erc-backend.el: Require `erc' instead of autoloading its macros. diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2012-10-18 12:49:18 +0000 +++ lisp/erc/ChangeLog 2012-10-18 15:51:28 +0000 @@ -1,6 +1,7 @@ 2012-10-18 Stefan Monnier - * erc-backend.el (erc-with-server-buffer): Autoload as well (bug#12669). + * erc-backend.el: Require `erc' instead of autoloading its macros + (bug#12669). 2012-10-15 Stefan Monnier === modified file 'lisp/erc/erc-backend.el' --- lisp/erc/erc-backend.el 2012-10-18 12:49:18 +0000 +++ lisp/erc/erc-backend.el 2012-10-18 15:51:28 +0000 @@ -99,9 +99,11 @@ (require 'erc-compat) (eval-when-compile (require 'cl)) -(autoload 'erc-with-buffer "erc" nil nil 'macro) -(autoload 'erc-with-server-buffer "erc" nil nil 'macro) -(autoload 'erc-log "erc") +;; There's a fairly strong mutual dependency between erc.el and erc-backend.el. +;; Luckily, erc.el does not need erc-backend.el for macroexpansion whereas the +;; reverse is true: +(provide 'erc-backend) +(require 'erc) ;;;; Variables and options ------------------------------------------------------------ revno: 110579 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2012-10-18 11:37:57 -0400 message: * lisp/emacs-lisp/advice.el: Clean up commentary a bit. (ad-do-advised-functions, ad-with-originals): Use `declare'. (byte-code-function-p): Never redefine. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-18 12:56:10 +0000 +++ lisp/ChangeLog 2012-10-18 15:37:57 +0000 @@ -1,5 +1,9 @@ 2012-10-18 Stefan Monnier + * emacs-lisp/advice.el: Clean up commentary a bit. + (ad-do-advised-functions, ad-with-originals): Use `declare'. + (byte-code-function-p): Never redefine. + * emacs-lisp/gv.el (cond): Same fix as before for `if'. 2012-10-18 Glenn Morris === modified file 'lisp/emacs-lisp/advice.el' --- lisp/emacs-lisp/advice.el 2012-09-14 13:44:31 +0000 +++ lisp/emacs-lisp/advice.el 2012-10-18 15:37:57 +0000 @@ -31,10 +31,6 @@ ;;; Commentary: -;; NOTE: This documentation is slightly out of date. In particular, all the -;; references to Emacs-18 are obsolete now, because it is not any longer -;; supported by this version of Advice. - ;; Advice is documented in the Emacs Lisp Manual. ;; @ Introduction: @@ -83,21 +79,10 @@ ;; - Provides manipulation mechanisms for sets of advised functions via ;; regular expressions that match advice names -;; @ How to get Advice for Emacs-18: -;; ================================= -;; `advice18.el', a version of Advice that also works in Emacs-18 is available -;; either via anonymous ftp from `ftp.cs.buffalo.edu (128.205.32.9)' with -;; pathname `/pub/Emacs/advice18.el', or from one of the Emacs Lisp archive -;; sites, or send email to and I'll mail it to you. - ;; @ Overview, or how to read this file: ;; ===================================== -;; NOTE: This documentation is slightly out of date. In particular, all the -;; references to Emacs-18 are obsolete now, because it is not any longer -;; supported by this version of Advice. An up-to-date version will soon be -;; available as an info file (thanks to the kind help of Jack Vinson and -;; David M. Smith). Until then you can use `outline-mode' to help you read -;; this documentation (set `outline-regexp' to `";; @+"'). +;; You can use `outline-mode' to help you read this documentation (set +;; `outline-regexp' to `";; @+"'). ;; ;; The four major sections of this file are: ;; @@ -111,9 +96,6 @@ ;; @ Restrictions: ;; =============== -;; - This version of Advice only works for Emacs 19.26 and later. It uses -;; new versions of the built-in functions `fset/defalias' which are not -;; yet available in Lucid Emacs, hence, it won't work there. ;; - Advised functions/macros/subrs will only exhibit their advised behavior ;; when they are invoked via their function cell. This means that advice will ;; not work for the following: @@ -229,13 +211,8 @@ ;; @@ Terminology: ;; =============== -;; - Emacs, Emacs-19: Emacs as released by the GNU Project -;; - Lemacs: Lucid's version of Emacs with major version 19 -;; - v18: Any Emacs with major version 18 or built as an extension to that -;; (such as Epoch) -;; - v19: Any Emacs with major version 19 -;; - jwz: Jamie Zawinski - former keeper of Lemacs and creator of the optimizing -;; byte-compiler used in v19s. +;; - Emacs: Emacs as released by the GNU Project +;; - jwz: Jamie Zawinski - creator of the byte-compiler used in v19s. ;; - Advice: The name of this package. ;; - advices: Short for "pieces of advice". @@ -294,8 +271,7 @@ ;; generates a compiled advised definition according to the ;; current advice state which will be used during activation ;; if appropriate. Only use this if the `defadvice' gets -;; actually compiled (with a v18 byte-compiler put the `defadvice' -;; into the body of a `defun' to accomplish proper compilation). +;; actually compiled. ;; An optional can be supplied to document the advice. ;; On call of the `documentation' function it will be combined with the @@ -399,10 +375,7 @@ ;; gets redefined in a non-advice style into a function by the edebug ;; package. If the advice assumes `eval-region' to be a subr it might break ;; once edebug is loaded. Similar situations arise when one wants to use the -;; same piece of advice across different versions of Emacs. Some subrs in a -;; v18 Emacs are functions in v19 and vice versa, but for the most part the -;; semantics remain the same, hence, the same piece of advice might be usable -;; in both Emacs versions. +;; same piece of advice across different versions of Emacs. ;; As a solution to that advice provides argument list access macros that get ;; translated into the proper access forms at activation time, i.e., when the @@ -556,12 +529,7 @@ ;; defined. The special forms `defun' and `defmacro' have been advised to ;; check whether the function/macro they defined had advice information ;; associated with it. If so and forward advice is enabled, the original -;; definition will be saved, and then the advice will be activated. When a -;; file is loaded in a v18 Emacs the functions/macros it defines are also -;; defined with calls to `defun/defmacro'. Hence, we can forward advise -;; functions/macros which will be defined later during a load/autoload of some -;; file (for compiled files generated by jwz's byte-compiler in a v19 Emacs -;; this is slightly more complicated but the basic idea is the same). +;; definition will be saved, and then the advice will be activated. ;; @@ Enabling/disabling pieces or sets of advice: ;; =============================================== @@ -694,10 +662,8 @@ ;; specified as disabled) and all other currently enabled pieces of advice to ;; construct an advised definition and an identifying cache-id and makes them ;; part of the `defadvice' expansion which will then be compiled by the -;; byte-compiler (to ensure that in a v18 emacs you have to put the -;; `defadvice' inside a `defun' to get it compiled and then you have to call -;; that compiled `defun' in order to actually execute the `defadvice'). When -;; the file with the compiled, preactivating `defadvice' gets loaded the +;; byte-compiler. +;; When the file with the compiled, preactivating `defadvice' gets loaded the ;; precompiled advised definition will be cached on the advised function's ;; advice-info. When it gets activated (can be immediately on execution of the ;; `defadvice' or any time later) the cache-id gets checked against the @@ -792,8 +758,7 @@ ;; advised definition of a function, rather they are assembled into a hook ;; form which will be evaluated whenever the advice-info of the advised ;; function gets activated or deactivated. One application of this mechanism -;; is to define file load hooks for files that do not provide such hooks -;; (v19s already come with a general file-load-hook mechanism, v18s don't). +;; is to define file load hooks for files that do not provide such hooks. ;; For example, suppose you want to print a message whenever `file-x' gets ;; loaded, and suppose the last function defined in `file-x' is ;; `file-x-last-fn'. Then we can define the following advice: @@ -1400,8 +1365,8 @@ ;; ;; If you put a preactivating `defadvice' into a Lisp file that gets byte- ;; compiled then the constructed advised definition will get compiled by -;; the byte-compiler. For that to occur in a v18 emacs you have to put the -;; `defadvice' inside a `defun' because the v18 compiler does not compile +;; the byte-compiler. For that to occur in a v18 Emacs you had to put the +;; `defadvice' inside a `defun' because the v18 compiler did not compile ;; top-level forms other than `defun' or `defmacro', for example, ;; ;; (defun fg-defadvice-fum () @@ -1496,10 +1461,7 @@ ;; if one advises a subr such as `eval-region' which then gets redefined by ;; some package (e.g., edebug) into a function with different argument names, ;; then a piece of advice written for `eval-region' that was written with -;; the subr arguments in mind will break. Similar situations arise when one -;; switches between major Emacs versions, e.g., certain subrs in v18 are -;; functions in v19 and vice versa. Also, in v19s subr argument lists -;; are available and will be used, while they are not available in v18. +;; the subr arguments in mind will break. ;; ;; Argument access text macros allow one to access arguments of an advised ;; function in a portable way without having to worry about all these @@ -1882,15 +1844,13 @@ BODY-FORM...) On each iteration VAR will be bound to the name of an advised function \(a symbol)." + (declare (indent 1)) `(cl-dolist (,(car varform) ad-advised-functions ,(car (cdr varform))) (setq ,(car varform) (intern (car ,(car varform)))) ,@body)) -(if (not (get 'ad-do-advised-functions 'lisp-indent-hook)) - (put 'ad-do-advised-functions 'lisp-indent-hook 1)) - (defun ad-get-advice-info (function) (get function 'ad-advice-info)) @@ -2117,7 +2077,7 @@ (lambda (function) ;; Oops, no closures - the joys of dynamic scoping: ;; `predicate' clashed with the `predicate' argument - ;; of Lemacs' `completing-read'..... + ;; of `completing-read'..... (funcall ad-pReDiCaTe (intern (car function)))))) t))) (if (equal function "") @@ -2394,12 +2354,6 @@ ;;"non-nil if DEFINITION is a piece of advice." `(eq (car-safe ,definition) 'advice)) -;; Emacs/Lemacs cross-compatibility -;; (compiled-function-p is an obsolete function in Emacs): -(if (and (not (fboundp 'byte-code-function-p)) - (fboundp 'compiled-function-p)) - (ad-safe-fset 'byte-code-function-p 'compiled-function-p)) - (defmacro ad-compiled-p (definition) "Return non-nil if DEFINITION is a compiled byte-code object." `(or (byte-code-function-p ,definition) @@ -3696,6 +3650,7 @@ For any members of FUNCTIONS that are not currently advised the rebinding will be a noop. Any modifications done to the definitions of FUNCTIONS will be undone on exit of this macro." + (declare (indent 1)) (let* ((index -1) ;; Make let-variables to store current definitions: (current-bindings @@ -3735,14 +3690,6 @@ ,(car (nth index current-bindings))))) functions)))))) -(if (not (get 'ad-with-originals 'lisp-indent-hook)) - (put 'ad-with-originals 'lisp-indent-hook 1)) - - -;; @@ Advising `documentation': -;; ============================ -;; Use the advice mechanism to advise `documentation' to make it -;; generate proper documentation strings for advised definitions: ;; @@ Starting, stopping and recovering from the advice package magic: ;; =================================================================== ------------------------------------------------------------ revno: 110578 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2012-10-18 08:56:10 -0400 message: * lisp/emacs-lisp/gv.el (cond): Same fix as before for `if'. * Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well. diff: === modified file 'ChangeLog' --- ChangeLog 2012-10-17 11:24:34 +0000 +++ ChangeLog 2012-10-18 12:56:10 +0000 @@ -1,3 +1,7 @@ +2012-10-18 Stefan Monnier + + * Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well. + 2012-10-15 Glenn Morris * Makefile.in (install-man, install-etc): @@ -10,8 +14,8 @@ 2012-10-08 Daniel Colascione - * configure.ac: Add --with-w32 as a window system option. Limit - it to Cygwin for now. Integrate w32 into the refactored window + * configure.ac: Add --with-w32 as a window system option. + Limit it to Cygwin for now. Integrate w32 into the refactored window system configuration and set TERM_HEADER to w32term.h when w32 is configured. @@ -796,8 +800,8 @@ 2012-06-26 Eli Zaretskii - * lib/makefile.w32-in ($(GNULIBOBJS)): Depend on stamp_BLD. This - replaces separate dependency for each object file, which required + * lib/makefile.w32-in ($(GNULIBOBJS)): Depend on stamp_BLD. + This replaces separate dependency for each object file, which required the same object file to be mentioned twice, causing failures in parallel builds. @@ -995,8 +999,8 @@ The build procedure now creates and for older hosts that lack a working or whose - does not define pid_t, size_t, ssize_t, mode_t. New - symbols such as WINDOWS_64_BIT_OFF_T may require attention in the + does not define pid_t, size_t, ssize_t, mode_t. + New symbols such as WINDOWS_64_BIT_OFF_T may require attention in the msdos and nt builds. Here is a precis of gnulib changes that seem relevant; please see @@ -2291,8 +2295,8 @@ * .bzrignore: Ignore new lib/*.in-h files. - * config.bat: Rename stdint.in.h and sys_stat.in.h. Call - depfiles.bat even if lib/deps already exist. + * config.bat: Rename stdint.in.h and sys_stat.in.h. + Call depfiles.bat even if lib/deps already exist. 2011-02-25 Paul Eggert @@ -2319,7 +2323,7 @@ 2011-02-21 Christoph Scholtes - * lib/makefile.w32-in ($(BLD)/md5.$(O)): Added dependency on + * lib/makefile.w32-in ($(BLD)/md5.$(O)): Add dependency on $(EMACS_ROOT)/nt/inc/stdint.h. 2011-02-21 Eli Zaretskii @@ -2420,7 +2424,7 @@ 2011-02-13 Bruno Haible Consistent macro naming for macros that use GCC __attribute__. - * lib/ignore-value.h (_GL_ATTRIBUTE_DEPRECATED): Renamed from + * lib/ignore-value.h (_GL_ATTRIBUTE_DEPRECATED): Rename from ATTRIBUTE_DEPRECATED. 2011-02-12 Bruno Haible @@ -2481,7 +2485,7 @@ 2011-02-05 Paul Eggert sync from gnulib to remove HAVE_STDBOOL_H - * m4/stdbool.m4 (AC_CHECK_HEADER_STDBOOL): Renamed from + * m4/stdbool.m4 (AC_CHECK_HEADER_STDBOOL): Rename from AC_HEADER_STDBOOL. All uses changed. Do not define HAVE_STDBOOL_H, as gnulib does not need this. This change is imported from the latest Autoconf git. It was motivated by Emacs, @@ -2566,8 +2570,8 @@ * lib/mktime.c (isdst_differ): New function. (__mktime_internal): Use it systematically for all isdst comparisons. This completes the fix for libc BZ #6723, and removes the need for - normalizing tm_isdst. See - + normalizing tm_isdst. + See (not_equal_tm) [DEBUG]: Use isdst_differ here, too. mktime: fix some integer overflow issues and sidestep the rest @@ -2641,7 +2645,7 @@ 2011-01-28 Paul Eggert improve fix for MS-DOS file name clash - * Makefile.in (DOS_gnulib_comp.m4): Renamed from DOS-gnulib-comp.m4, + * Makefile.in (DOS_gnulib_comp.m4): Rename from DOS-gnulib-comp.m4, for portability to POSIX make. Reported by Bruno Haible. (sync-from-gnulib): Copy gl-comp.m4 (if present) back to gnulib-comp.m4 before running gnulib-tool, to prevent old gnulib @@ -2932,8 +2936,8 @@ 2010-12-04 Andreas Schwab * configure.in: Remove reference to removed machine description - files and allow $machine and $machfile to be empty. Substitute - M_FILE/S_FILE instead of machfile/opsysfile. + files and allow $machine and $machfile to be empty. + Substitute M_FILE/S_FILE instead of machfile/opsysfile. 2010-12-03 Glenn Morris @@ -2966,8 +2970,8 @@ 2010-10-31 Ken Brown - * configure.in (checking whether localtime caches TZ): Use - unsetenv instead of modifying environment directly. + * configure.in (checking whether localtime caches TZ): + Use unsetenv instead of modifying environment directly. 2010-10-25 Andreas Schwab @@ -3000,8 +3004,8 @@ 2010-10-12 Dan Nicolaescu - * configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove - trailing / from directory names. + * configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): + Remove trailing / from directory names. 2010-10-12 Glenn Morris @@ -4212,8 +4216,8 @@ 2008-08-21 Christian Faulhammer (tiny change) - * configure.in (GNUSTEP_SYSTEM_HEADERS): Define - GNUSTEP_SYSTEM_HEADERS and GNUSTEP_SYSTEM_LIBRARIES. + * configure.in (GNUSTEP_SYSTEM_HEADERS): + Define GNUSTEP_SYSTEM_HEADERS and GNUSTEP_SYSTEM_LIBRARIES. * configure: Regenerate. @@ -4254,8 +4258,8 @@ 2008-08-06 Adrian Robert * configure.in (NS_HAVE_INTEGER): Rename to NS_HAVE_NSINTEGER. - (C_SWITCH_X_SYSTEM): Drop -MMD -MP under NS_IMPL_GNUstep. Don't - bother undef'ing since won't have desired effect. + (C_SWITCH_X_SYSTEM): Drop -MMD -MP under NS_IMPL_GNUstep. + Don't bother undef'ing since won't have desired effect. 2008-08-06 Andreas Schwab @@ -5152,8 +5156,8 @@ 2007-03-19 Deanna Phillips (tiny change) * configure.in (arm-*-openbsd*, hppa-*-openbsd*) - (m88k-*-openbsd*, mips64-*-openbsd*, sh-*-openbsd*): Added. - (ns32k-*-openbsd*, ns32k-*-openbsd*): Deleted. + (m88k-*-openbsd*, mips64-*-openbsd*, sh-*-openbsd*): Add. + (ns32k-*-openbsd*, ns32k-*-openbsd*): Delete. 2007-03-19 Chong Yidong @@ -5483,7 +5487,7 @@ * configure.in: Use GZIP_PROG instead of GZIP. - * Makefile.in (GZIP_PROG): Renamed from GZIP. + * Makefile.in (GZIP_PROG): Rename from GZIP. (install-arch-indep): Adjust. 2005-11-01 Andreas Schwab @@ -5596,8 +5600,8 @@ 2005-05-13 YAMAMOTO Mitsuharu * configure.in: Don't check HAVE_CARBON if HAVE_X11 is set to yes. - Check HAVE_CARBON before USE_TOOLKIT_SCROLL_BARS. Define - USE_TOOLKIT_SCROLL_BARS by default if HAVE_CARBON is set to yes. + Check HAVE_CARBON before USE_TOOLKIT_SCROLL_BARS. + Define USE_TOOLKIT_SCROLL_BARS by default if HAVE_CARBON is set to yes. 2005-05-07 Jérôme Marant @@ -6691,8 +6695,8 @@ * Makefile.in (uninstall): Ignore exit code of `rm'. - * Makefile.in (uninstall): Remove more info files. Remove - ${libexecdir}/emacs/${version}. Remove ${archlibdir}/fns-*. + * Makefile.in (uninstall): Remove more info files. + Remove ${libexecdir}/emacs/${version}. Remove ${archlibdir}/fns-*. 2001-01-31 Gerd Moellmann @@ -6700,7 +6704,7 @@ 2001-01-28 Gerd Moellmann - * Makefile.in (extraclean): Added -f to -rm config-tmp-* to keep + * Makefile.in (extraclean): Add -f to -rm config-tmp-* to keep it quiet. 2001-01-24 Colin Walters @@ -6895,7 +6899,7 @@ (NON-TIT-CNS, JAPANESE, KOREAN, THAI, VIETNAMESE, LAO, INDIAN) (TIBETAN, LATIN, SLAVIC, GREEK, RUSSIAN, MISC): Rename all .el files to .elc. - (${TIT}): Adjusted for the above change. + (${TIT}): Adjust for the above change. (clean mostlyclean): Likewise. (.el.elc): New target. @@ -6982,7 +6986,7 @@ 2000-07-26 Dave Love - * configure.in (AC_SYS_LARGEFILE): Moved earlier. + * configure.in (AC_SYS_LARGEFILE): Move earlier. 2000-07-24 Dave Love @@ -7154,8 +7158,8 @@ * Makefile.in (bootstrap-lisp-1, bootstrap-lisp, bootstrap-src): New targets. - (bootstrap): Rewritten in terms of the new targets above. Make - info files, too. + (bootstrap): Rewritten in terms of the new targets above. + Make info files, too. 2000-03-12 Gerd Moellmann @@ -7234,8 +7238,8 @@ 2000-01-03 Andreas Schwab - * Makefile.in (install-arch-indep): Install autotype*. Run - install-info on autotype and emacs-faq.info. + * Makefile.in (install-arch-indep): Install autotype*. + Run install-info on autotype and emacs-faq.info. 1999-12-04 Dave Love @@ -7311,7 +7315,7 @@ 1999-09-07 Gerd Moellmann - * configure.in (--with-sound): Removed. + * configure.in (--with-sound): Remove. 1999-08-30 Gerd Moellmann @@ -7408,7 +7412,7 @@ * configure.in: Use epaths.h and epaths-force instead of paths... - * Makefile.in (epaths-force): Renamed from paths-force; + * Makefile.in (epaths-force): Rename from paths-force; operate on epaths.in and produce epaths.h. 1999-02-24 Richard Stallman @@ -7753,8 +7757,8 @@ 1997-08-24 NIIBE Yutaka - * configure.in (x_default_search_path): Corrected - '${x_library}' to '${x_library}/X11'. + * configure.in (x_default_search_path): + Corrected '${x_library}' to '${x_library}/X11'. 1997-08-22 Richard Stallman @@ -8454,7 +8458,7 @@ 1995-12-24 Richard Stallman * configure.in: Determine HAVE_X11R6. - (HAVE_MENUS): Renamed from HAVE_X_MENU. + (HAVE_MENUS): Rename from HAVE_X_MENU. 1995-12-21 Richard Stallman @@ -8647,8 +8651,8 @@ 1995-07-06 David J. MacKenzie - * configure.in: Put back archlibdir initialization. Require - autoconf 2.4.1 or later. + * configure.in: Put back archlibdir initialization. + Require autoconf 2.4.1 or later. 1995-07-01 Richard Stallman @@ -8776,7 +8780,7 @@ * make-dist: Put src/makefile.nt in dist. * configure.in (i[345]86-*-bsdi2*): New configuration. - (vax-dec-bsd386*): Deleted. + (vax-dec-bsd386*): Delete. 1995-05-06 David J. MacKenzie @@ -8786,7 +8790,7 @@ 1995-05-03 Richard Stallman - * configure.in (m68*-apollo-*): Renamed from m68*-apollo*. + * configure.in (m68*-apollo-*): Rename from m68*-apollo*. Use bsd4-3. Don't set NON_GNU_CPP. * make-dist: Don't copy in src/s/*.inp. Don't copy nt/src. @@ -8863,7 +8867,7 @@ 1995-02-07 Richard Stallman - * Makefile.in (maintainer-clean): Renamed from realclean. + * Makefile.in (maintainer-clean): Rename from realclean. 1995-02-02 David J. MacKenzie @@ -9032,8 +9036,8 @@ * Makefile.in: Use libexecdir and sharedstatedir as appropriate. - * configure.in (libexecdir): Renamed from libdir. New default. - (sharedstatedir): Renamed from statedir. New default. + * configure.in (libexecdir): Rename from libdir. New default. + (sharedstatedir): Rename from statedir. New default. (datadir): New default. * make-dist: Don't distribute subdirs.el. @@ -9583,7 +9587,7 @@ 1994-02-14 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu) - * configure.in (rs6000-bull-bosx*): Added support for BULL dpx20. + * configure.in (rs6000-bull-bosx*): Add support for BULL dpx20. 1994-02-11 Karl Heuer (kwzh@mole.gnu.ai.mit.edu) @@ -9736,7 +9740,7 @@ * Makefile.in (mkdir): Make only the lockdir writable. - * configure.in (i860-*-sysv4): Renamed from i860-*-sysvr4. + * configure.in (i860-*-sysv4): Rename from i860-*-sysvr4. 1993-12-11 Richard Stallman (rms@srarc2) @@ -9850,8 +9854,8 @@ 1993-09-28 Brian J. Fox (bfox@cubit) * configure.in: Don't copy ${srcdir}/src/Makefile.in; that file - doesn't exist. Just copy src/Makefile.in instead. Touch - all of the Makefiles after editing config.status. + doesn't exist. Just copy src/Makefile.in instead. + Touch all of the Makefiles after editing config.status. * INSTALL: Update documentation to match new configuration mechanism. @@ -9932,8 +9936,8 @@ 1993-09-10 Roland McGrath (roland@churchy.gnu.ai.mit.edu) - * configure.in: Remove check for $srcdir being configured. This - pretty much works now. + * configure.in: Remove check for $srcdir being configured. + This pretty much works now. Grok {m68*-hp,i[34]86-*}-netbsd* and set opsys=netbsd. Check for XFree86 (/usr/X386/include) independent of whether -lXbsd exists. @@ -9974,7 +9978,7 @@ 1993-08-10 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * configure.in (m88k-tektronix-sysv3*): Added the missing *. + * configure.in (m88k-tektronix-sysv3*): Add the missing *. Use tekxd88, not tekXD88. 1993-08-10 Roland McGrath (roland@churchy.gnu.ai.mit.edu) @@ -10349,8 +10353,8 @@ * INSTALL: Mention its usage. * configure.in (hppa-hp-hpux): Use uname -r instead of uname -m; - the former gives you the operating system rev directly. Use - s/hpux.h if we don't recognize what we got. + the former gives you the operating system rev directly. + Use s/hpux.h if we don't recognize what we got. * Makefile.in (do-install): Don't remove a destination directory if it's the same as the source. If ${srcdir}/info == ${infodir}, @@ -10397,8 +10401,8 @@ * Makefile.in (install): Split this into `install' and `do-install', to give people more control over exactly what gets done. - (do-install): New target, containing the guts of `install'. Don't - remove and recreate the directories inside the copying loop - do + (do-install): New target, containing the guts of `install'. + Don't remove and recreate the directories inside the copying loop - do it all before the copying loop. Pass more flags to the lib-src make. (mkdir): Create ${infodir}, ${mandir}, and ${sitelispdir} here, to @@ -10455,7 +10459,7 @@ * configure.in: Make the first line of the configure script be "#!/bin/sh". Leaving the first line blank didn't work. - * configure.in (long_usage): Removed; made short_usage describe + * configure.in (long_usage): Remove; made short_usage describe the options briefly. * configure.in: Implement the --prefix option. @@ -10527,11 +10531,11 @@ * PROBLEMS: Some updates from David J. Mackenzie. More changes from David J. Mackenzie. - * Makefile.in (install.sysv, install.xenix, install.aix): Targets - removed; autoconf and config.h should specify all these + * Makefile.in (install.sysv, install.xenix, install.aix): + Targets removed; autoconf and config.h should specify all these differences. (buildlisppath): Make this path depend on ${srcdir}. - (INSTALLFLAGS): Removed. + (INSTALLFLAGS): Remove. (INSTALL): Include the -c flag. (install): Change the way we invoke install accordingly. @@ -10574,14 +10578,14 @@ 1993-05-09 Jim Blandy (jimb@totoro.cs.oberlin.edu) - * Makefile.in (DEFS): Deleted; since we're using AC_CONFIG_HEADER, + * Makefile.in (DEFS): Delete; since we're using AC_CONFIG_HEADER, this is always just -DHAVE_CONFIG_H. The GNU coding standards specify that CFLAGS should be left for users to set. * Makefile.in (CFLAGS): Let configure determine the default value - for this. Don't - have it default to DEFS. + for this. + Don't have it default to DEFS. (${SUBDIR}): Pass CFLAGS down to submakes, not DEFS. (lib-src/Makefile, src/Makefile): Edit the default value for CFLAGS into these files, not DEFS. @@ -10707,17 +10711,17 @@ Use autoconf to produce Makefile and src/config.h. Remove the Makefile-style comment that autoconf places at the top of src/config.h. - (config_h_opts): Removed - no longer necessary. - * Makefile.in (configname): Renamed to configuration. - (CONFIG_CFLAGS): Renamed to DEFS. - (CC, DEFS, C_SWITCH_SYSTEM, version, configuration): Adjusted to + (config_h_opts): Remove - no longer necessary. + * Makefile.in (configname): Rename to configuration. + (CONFIG_CFLAGS): Rename to DEFS. + (CC, DEFS, C_SWITCH_SYSTEM, version, configuration): Adjust to get values via autoload @cookies@. (libsrc_libs): Get this from autoconf. We used to do nothing about this. (${SUBDIR}): Pass DEFS to submakes instead of CONFIG_CFLAGS. - * Makefile.in (src/paths.h, lib-src/Makefile, src/Makefile): Don't - echo the move-if-change command. + * Makefile.in (src/paths.h, lib-src/Makefile, src/Makefile): + Don't echo the move-if-change command. 1993-04-08 Jim Blandy (jimb@churchy.gnu.ai.mit.edu) @@ -10772,8 +10776,8 @@ * configure: Properly handle extracting values of LIBS_MACHINE and LIBS_SYSTEM that contain spaces. - * configure: Add `--x-includes' and `--x-libraries' options. I - think these are dopey, but no less than three alpha testers, at + * configure: Add `--x-includes' and `--x-libraries' options. + I think these are dopey, but no less than three alpha testers, at large sites, have said they have their X files installed in odd places. Implement them by setting C_SWITCH_X_SITE and LD_SWITCH_X_SITE in src/config.h. @@ -10978,8 +10982,8 @@ * Makefile.in (datadir, statedir, libdir): Make these all default to ${prefix}/lib. - (lispdir, locallisppath, etcdir, lockdir, archlibdir): Adjusted - to compensate. + (lispdir, locallisppath, etcdir, lockdir, archlibdir): + Adjust to compensate. * Makefile.in (install, install.sysv, install.xenix, install.aix): Install the etags and ctags man pages too. @@ -10994,7 +10998,7 @@ * configure (long_usage): Remove all traces of old arguments from usage messages, and document the options we do accept in more detail: -with-x... and --srcdir. - (options, boolean_opts): Deleted; we don't have enough options to + (options, boolean_opts): Delete; we don't have enough options to make this worthwhile. (prefix, bindir, lisppath, datadir, libdir, lockdir): Deleted, along with the code which supported them; these should be set as @@ -11019,8 +11023,8 @@ compile in don't exist yet, create them under the current directory. Note that the rest of the build process doesn't really support this. - Edit only the top Makefile. That should edit the others. Edit - into the makefile: `version', from lisp/version.el, `configname' + Edit only the top Makefile. That should edit the others. + Edit into the makefile: `version', from lisp/version.el, `configname' and `srcdir' from the configuration arguments, `CC' and `CONFIG_CFLAGS' as guessed from the presence or absence of GCC in the user's path, and LOADLIBES as gleaned from the system @@ -11263,8 +11267,8 @@ * make-dist: When setting up etc/COPYING, always nuke whatever is 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 superseded by a + * make-dist: Don't try to distribute *.defns files any more. + The 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) @@ -11435,10 +11439,10 @@ (mostlyclean): New target, synonymous with clean. (realclean): New target. Currently, this just calls the subdirectories's makefiles and then deletes config.status. - (INSTALL, INSTALLFLAGS, INSTALL_PROGRAM, INSTALL_DATA): New - variables. + (INSTALL, INSTALLFLAGS, INSTALL_PROGRAM, INSTALL_DATA): + New variables. Installation directory variables changed to conform. - (install, install.sysv, install.xenix, install.aix): Changed the + (install, install.sysv, install.xenix, install.aix): Change the code which copies the directories into their installed location to allow the installed locations to be in several different directories; the old version assumed that they would all be in === modified file 'Makefile.in' --- Makefile.in 2012-10-15 21:57:20 +0000 +++ Makefile.in 2012-10-18 12:56:10 +0000 @@ -361,7 +361,7 @@ # etc. to be built without running into similar recursion problems. MAKEFILE_NAME = Makefile $(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \ - $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN) + $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN) $(srcdir)/src/lisp.mk MAKE='$(MAKE)' ./config.status # Don't erase these files if make is interrupted while refreshing them. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-18 03:50:15 +0000 +++ lisp/ChangeLog 2012-10-18 12:56:10 +0000 @@ -1,3 +1,7 @@ +2012-10-18 Stefan Monnier + + * emacs-lisp/gv.el (cond): Same fix as before for `if'. + 2012-10-18 Glenn Morris * dired.el (dired-sort-toggle): Some ls implementations only allow @@ -7,8 +11,8 @@ 2012-10-17 Kenichi Handa - * international/mule.el (set-keyboard-coding-system): Recover - input meta mode when the new coding system doesn not use 8-bit. + * international/mule.el (set-keyboard-coding-system): + Recover input meta mode when the new coding system doesn not use 8-bit. Supply TERMINAL arg to set-input-meta-mode. 2012-10-17 Michael Heerdegen (tiny change) === modified file 'lisp/emacs-lisp/gv.el' --- lisp/emacs-lisp/gv.el 2012-10-14 01:39:56 +0000 +++ lisp/emacs-lisp/gv.el 2012-10-18 12:56:10 +0000 @@ -377,7 +377,8 @@ (put 'cond 'gv-expander (lambda (do &rest branches) - (if (macroexp-small-p (funcall do 'dummy (lambda (_) 'dummy))) + (if (or (not lexical-binding) ;The other code requires lexical-binding. + (macroexp-small-p (funcall do 'dummy (lambda (_) 'dummy)))) ;; This duplicates the `do' code, which is a problem if that ;; code is large, but otherwise results in more efficient code. `(cond ------------------------------------------------------------ revno: 110577 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12669 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2012-10-18 08:49:18 -0400 message: * lisp/erc/erc-backend.el (erc-with-server-buffer): Autoload as well. diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2012-10-15 16:49:57 +0000 +++ lisp/erc/ChangeLog 2012-10-18 12:49:18 +0000 @@ -1,3 +1,7 @@ +2012-10-18 Stefan Monnier + + * erc-backend.el (erc-with-server-buffer): Autoload as well (bug#12669). + 2012-10-15 Stefan Monnier * erc.el (erc-log): Make it into a defsubst. === modified file 'lisp/erc/erc-backend.el' --- lisp/erc/erc-backend.el 2012-10-15 16:49:57 +0000 +++ lisp/erc/erc-backend.el 2012-10-18 12:49:18 +0000 @@ -100,6 +100,7 @@ (require 'erc-compat) (eval-when-compile (require 'cl)) (autoload 'erc-with-buffer "erc" nil nil 'macro) +(autoload 'erc-with-server-buffer "erc" nil nil 'macro) (autoload 'erc-log "erc") ;;;; Variables and options ------------------------------------------------------------ revno: 110576 committer: martin rudalics branch nick: trunk timestamp: Thu 2012-10-18 10:27:49 +0200 message: In window.c fix two flaws reported by Dmitry Antipov. * window.c (Ftemp_output_buffer_show): Remove. (Fwindow_vscroll, Fset_window_vscroll): Use decode_live_window. (syms_of_window): Remove defsubr for Stemp_output_buffer_show. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-17 19:02:44 +0000 +++ src/ChangeLog 2012-10-18 08:27:49 +0000 @@ -1,10 +1,17 @@ +2012-10-18 Martin Rudalics + + Fix two flaws reported by Dmitry Antipov. + * window.c (Ftemp_output_buffer_show): Remove. + (Fwindow_vscroll, Fset_window_vscroll): Use decode_live_window. + (syms_of_window): Remove defsubr for Stemp_output_buffer_show. + 2012-10-17 Eli Zaretskii - * makefile.w32-in ($(BLD)/w32.$(O)): - ($(BLD)/vm-limit.$(O)): - ($(BLD)/term.$(O)): - ($(BLD)/unexw32.$(O)): - ($(BLD)/fileio.$(O)): + * makefile.w32-in ($(BLD)/w32.$(O)): + ($(BLD)/vm-limit.$(O)): + ($(BLD)/term.$(O)): + ($(BLD)/unexw32.$(O)): + ($(BLD)/fileio.$(O)): ($(BLD)/dispnew.$(O)): Update dependencies. * w32term.h (w32_initialize_display_info, initialize_w32_display): === modified file 'src/window.c' --- src/window.c 2012-10-15 09:03:56 +0000 +++ src/window.c 2012-10-18 08:27:49 +0000 @@ -3339,7 +3339,7 @@ return Qnil; } - +/* Obsolete since 24.3. */ void temp_output_buffer_show (register Lisp_Object buf) { @@ -3392,16 +3392,6 @@ } } } - -DEFUN ("internal-temp-output-buffer-show", - Ftemp_output_buffer_show, Stemp_output_buffer_show, - 1, 1, 0, - doc: /* Internal function for `with-output-to-temp-buffer'. */) - (Lisp_Object buf) -{ - temp_output_buffer_show (buf); - return Qnil; -} /* Make new window, have it replace WINDOW in window-tree, and make WINDOW its only vertical child (HORFLAG 1 means make WINDOW its only @@ -6423,15 +6413,8 @@ (Lisp_Object window, Lisp_Object pixels_p) { Lisp_Object result; - struct frame *f; - struct window *w; - - if (NILP (window)) - window = selected_window; - else - CHECK_WINDOW (window); - w = XWINDOW (window); - f = XFRAME (w->frame); + struct window *w = decode_live_window (window); + struct frame *f = XFRAME (w->frame); if (FRAME_WINDOW_P (f)) result = (NILP (pixels_p) @@ -6455,18 +6438,11 @@ If PIXELS-P is non-nil, the return value is VSCROLL. */) (Lisp_Object window, Lisp_Object vscroll, Lisp_Object pixels_p) { - struct window *w; - struct frame *f; + struct window *w = decode_live_window (window); + struct frame *f = XFRAME (w->frame); - if (NILP (window)) - window = selected_window; - else - CHECK_WINDOW (window); CHECK_NUMBER_OR_FLOAT (vscroll); - w = XWINDOW (window); - f = XFRAME (w->frame); - if (FRAME_WINDOW_P (f)) { int old_dy = w->vscroll; @@ -6923,7 +6899,6 @@ defsubr (&Srun_window_configuration_change_hook); defsubr (&Sselect_window); defsubr (&Sforce_window_update); - defsubr (&Stemp_output_buffer_show); defsubr (&Ssplit_window_internal); defsubr (&Sscroll_up); defsubr (&Sscroll_down); ------------------------------------------------------------ revno: 110575 fixes bug: http://debbugs.gnu.org/12666 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-10-17 20:50:15 -0700 message: * dired.el (dired-sort-toggle): Some ls implementations only allow a single option string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-18 03:30:04 +0000 +++ lisp/ChangeLog 2012-10-18 03:50:15 +0000 @@ -1,5 +1,8 @@ 2012-10-18 Glenn Morris + * dired.el (dired-sort-toggle): Some ls implementations only allow + a single option string. (Bug#12666) + * minibuffer.el (completion-cycle-threshold): Doc fix. 2012-10-17 Kenichi Handa === modified file 'lisp/dired.el' --- lisp/dired.el 2012-10-04 18:30:08 +0000 +++ lisp/dired.el 2012-10-18 03:50:15 +0000 @@ -3546,8 +3546,15 @@ (setq dired-actual-switches (replace-match "" t t dired-actual-switches 3)))) ;; Now, if we weren't sorting by date before, add the -t switch. + ;; Some simple-minded ls implementations (eg ftp servers) only + ;; allow a single option string, so try not to add " -t" if possible. (unless sorting-by-date - (setq dired-actual-switches (concat dired-actual-switches " -t")))) + (setq dired-actual-switches + (concat dired-actual-switches + (if (string-match-p "\\`-[[:alnum:]]+\\'" + dired-actual-switches) + "t" + " -t"))))) (dired-sort-set-mode-line) (revert-buffer))