Now on revision 105193. ------------------------------------------------------------ revno: 105193 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Thu 2011-07-14 14:57:06 +0200 message: (initial-buffer-choice): Don't mention the `none' selection, which is against policy. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-14 08:30:34 +0000 +++ lisp/ChangeLog 2011-07-14 12:57:06 +0000 @@ -1,3 +1,8 @@ +2011-07-14 Lars Magne Ingebrigtsen + + * startup.el (initial-buffer-choice): Don't mention the `none' + selection, which is against policy. + 2011-07-14 Martin Rudalics * window.el (display-buffer-normalize-special): Replace === modified file 'lisp/startup.el' --- lisp/startup.el 2011-07-13 21:53:41 +0000 +++ lisp/startup.el 2011-07-14 12:57:06 +0000 @@ -43,14 +43,12 @@ If the value is nil and `inhibit-startup-screen' is nil, show the startup screen. If the value is string, visit the specified file or directory using `find-file'. If t, open the `*scratch*' -buffer. If `none', don't select anything, but show the -buffer (if any) selected by the startup file." +buffer." :type '(choice (const :tag "Startup screen" nil) (directory :tag "Directory" :value "~/") (file :tag "File" :value "~/.emacs") - (const :tag "Lisp scratch buffer" t) - (const :tag "Select no buffer" 'none)) + (const :tag "Lisp scratch buffer" t)) :version "23.1" :group 'initialization) ------------------------------------------------------------ revno: 105192 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-07-14 06:19:36 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2011-07-12 10:19:18 +0000 +++ autogen/configure 2011-07-14 10:19:36 +0000 @@ -11140,23 +11140,23 @@ else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.26" >&5 -$as_echo_n "checking for glib-2.0 >= 2.26... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.26" >&5 +$as_echo_n "checking for gio-2.0 >= 2.26... " >&6; } - if $PKG_CONFIG --exists "glib-2.0 >= 2.26" 2>&5; then + if $PKG_CONFIG --exists "gio-2.0 >= 2.26" 2>&5; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } succeeded=yes { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_CFLAGS" >&5 $as_echo_n "checking GSETTINGS_CFLAGS... " >&6; } - GSETTINGS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.26"|sed -e 's,///*,/,g'` + GSETTINGS_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.26"|sed -e 's,///*,/,g'` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_CFLAGS" >&5 $as_echo "$GSETTINGS_CFLAGS" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_LIBS" >&5 $as_echo_n "checking GSETTINGS_LIBS... " >&6; } - GSETTINGS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.26"|sed -e 's,///*,/,g'` + GSETTINGS_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.26"|sed -e 's,///*,/,g'` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_LIBS" >&5 $as_echo "$GSETTINGS_LIBS" >&6; } else @@ -11166,7 +11166,7 @@ GSETTINGS_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - GSETTINGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.26"` + GSETTINGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gio-2.0 >= 2.26"` fi ------------------------------------------------------------ revno: 105191 committer: martin rudalics branch nick: trunk timestamp: Thu 2011-07-14 10:30:34 +0200 message: Fix bugs in vertical-motion and display-buffer-normalize-special. * indent.c (Fvertical_motion): Set and restore w->pointm when saving and restoring the window's buffer (Bug#9006). * window.el (display-buffer-normalize-special): Replace `dedicated' by `dedicate' to dedicate window (Bug#9072). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-14 06:50:21 +0000 +++ lisp/ChangeLog 2011-07-14 08:30:34 +0000 @@ -1,3 +1,8 @@ +2011-07-14 Martin Rudalics + + * window.el (display-buffer-normalize-special): Replace + `dedicated' by `dedicate' to dedicate window (Bug#9072). + 2011-07-14 Eli Zaretskii * subr.el (version<, version<=, version=): Mention "-CVS" and === modified file 'lisp/window.el' --- lisp/window.el 2011-07-13 22:00:48 +0000 +++ lisp/window.el 2011-07-14 08:30:34 +0000 @@ -5317,12 +5317,12 @@ (unless display-buffer-mark-dedicated ;; Don't make anything created above dedicated unless requested. ;; Otherwise the dedication request below gets in our way. - '((dedicated . nil))) + '((dedicate . nil))) `((pop-up-frame t) ,(append '(pop-up-frame-alist) (when (listp args) args) special-display-frame-alist) - (dedicated . t)))))) + (dedicate . t)))))) (defun display-buffer-normalize-default (buffer-or-name) "Subroutine of `display-buffer-normalize-specifiers'. === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-13 23:48:35 +0000 +++ src/ChangeLog 2011-07-14 08:30:34 +0000 @@ -1,3 +1,8 @@ +2011-07-14 Martin Rudalics + + * indent.c (Fvertical_motion): Set and restore w->pointm when + saving and restoring the window's buffer (Bug#9006). + 2011-07-13 Lars Magne Ingebrigtsen * editfns.c (Fstring_to_char): Clarify just what is returned === modified file 'src/indent.c' --- src/indent.c 2011-07-10 08:20:10 +0000 +++ src/indent.c 2011-07-14 08:30:34 +0000 @@ -1985,7 +1985,8 @@ struct text_pos pt; struct window *w; Lisp_Object old_buffer; - struct gcpro gcpro1; + EMACS_INT old_charpos, old_bytepos; + struct gcpro gcpro1, gcpro2, gcpro3; Lisp_Object lcols = Qnil; double cols IF_LINT (= 0); @@ -2005,12 +2006,16 @@ w = XWINDOW (window); old_buffer = Qnil; - GCPRO1 (old_buffer); + GCPRO3 (old_buffer, old_charpos, old_bytepos); if (XBUFFER (w->buffer) != current_buffer) { /* Set the window's buffer temporarily to the current buffer. */ old_buffer = w->buffer; + old_charpos = XMARKER (w->pointm)->charpos; + old_bytepos = XMARKER (w->pointm)->bytepos; XSETBUFFER (w->buffer, current_buffer); + set_marker_both + (w->pointm, w->buffer, BUF_PT (current_buffer), BUF_PT_BYTE (current_buffer)); } if (noninteractive) @@ -2131,7 +2136,10 @@ } if (BUFFERP (old_buffer)) - w->buffer = old_buffer; + { + w->buffer = old_buffer; + set_marker_both (w->pointm, w->buffer, old_charpos, old_bytepos); + } RETURN_UNGCPRO (make_number (it.vpos)); } ------------------------------------------------------------ revno: 105190 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-07-14 02:50:21 -0400 message: lisp/subr.el (version-*): Doc fix. lisp/subr.el (version<, version<=, version=): Mention "-CVS" and "-12345" alpha version numbers. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-14 01:58:51 +0000 +++ lisp/ChangeLog 2011-07-14 06:50:21 +0000 @@ -1,3 +1,8 @@ +2011-07-14 Eli Zaretskii + + * subr.el (version<, version<=, version=): Mention "-CVS" and + "-12345" alpha version numbers. + 2011-07-14 Chong Yidong * bindings.el: Add advertised binding for set-mark-command === modified file 'lisp/subr.el' --- lisp/subr.el 2011-07-13 23:40:11 +0000 +++ lisp/subr.el 2011-07-14 06:50:21 +0000 @@ -4087,7 +4087,8 @@ Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", etc. That is, the trailing \".0\"s are insignificant. Also, version string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\", -which is higher than \"1alpha\"." +which is higher than \"1alpha\". Also, \"-CVS\" and \"-NNN\" are treated +as alpha versions." (version-list-< (version-to-list v1) (version-to-list v2))) @@ -4097,7 +4098,8 @@ Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", etc. That is, the trailing \".0\"s are insignificant. Also, version string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\", -which is higher than \"1alpha\"." +which is higher than \"1alpha\". Also, \"-CVS\" and \"-NNN\" are treated +as alpha versions." (version-list-<= (version-to-list v1) (version-to-list v2))) (defun version= (v1 v2) @@ -4106,7 +4108,8 @@ Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\", etc. That is, the trailing \".0\"s are insignificant. Also, version string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\", -which is higher than \"1alpha\"." +which is higher than \"1alpha\". Also, \"-CVS\" and \"-NNN\" are treated +as alpha versions." (version-list-= (version-to-list v1) (version-to-list v2))) ------------------------------------------------------------ revno: 105189 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-07-13 21:58:51 -0400 message: * bindings.el: Add advertised binding for set-mark-command (Bug#5772). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-14 01:40:30 +0000 +++ lisp/ChangeLog 2011-07-14 01:58:51 +0000 @@ -1,5 +1,10 @@ 2011-07-14 Chong Yidong + * bindings.el: Add advertised binding for set-mark-command + (Bug#5772). + +2011-07-14 Chong Yidong + * bindings.el (mode-line-other-buffer): * bookmark.el (bookmark-bmenu-2-window): * bs.el (bs-cycle-next, bs-cycle-previous): === modified file 'lisp/bindings.el' --- lisp/bindings.el 2011-07-14 01:40:30 +0000 +++ lisp/bindings.el 2011-07-14 01:58:51 +0000 @@ -849,6 +849,8 @@ (define-key global-map "\C-@" 'set-mark-command) ;; Many people are used to typing C-SPC and getting C-@. (define-key global-map [?\C- ] 'set-mark-command) +(put 'set-mark-command :advertised-binding [?\C- ]) + (define-key ctl-x-map "\C-x" 'exchange-point-and-mark) (define-key ctl-x-map "\C-@" 'pop-global-mark) (define-key ctl-x-map [?\C- ] 'pop-global-mark) ------------------------------------------------------------ revno: 105188 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-07-13 21:40:30 -0400 message: Adapt 2011-07-05 switch-to-buffer changes to new switch-to-buffer * lisp/bindings.el (mode-line-other-buffer): * lisp/bookmark.el (bookmark-bmenu-2-window): * lisp/bs.el (bs-cycle-next, bs-cycle-previous): * lisp/net/tramp-cmds.el (tramp-append-tramp-buffers): Revert to using switch-to-buffer. * lisp/net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window): Deleted. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-14 01:09:00 +0000 +++ lisp/ChangeLog 2011-07-14 01:40:30 +0000 @@ -1,3 +1,14 @@ +2011-07-14 Chong Yidong + + * bindings.el (mode-line-other-buffer): + * bookmark.el (bookmark-bmenu-2-window): + * bs.el (bs-cycle-next, bs-cycle-previous): + * net/tramp-cmds.el (tramp-append-tramp-buffers): Revert to using + switch-to-buffer. + + * net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window): + Deleted. + 2011-07-14 Juanma Barranquero * follow.el (follow-debug-message, follow-redisplay): === modified file 'lisp/bindings.el' --- lisp/bindings.el 2011-07-13 13:39:23 +0000 +++ lisp/bindings.el 2011-07-14 01:40:30 +0000 @@ -471,8 +471,7 @@ (defun mode-line-other-buffer () "\ Switch to the most recently selected buffer other than the current one." (interactive) - (with-no-warnings ; We really do want to call `switch-to-buffer' here. - (switch-to-buffer (other-buffer)))) + (switch-to-buffer (other-buffer) nil t)) (defun mode-line-next-buffer (event) "Like `next-buffer', but temporarily select EVENT's window." === modified file 'lisp/bookmark.el' --- lisp/bookmark.el 2011-07-05 15:31:22 +0000 +++ lisp/bookmark.el 2011-07-14 01:40:30 +0000 @@ -1841,8 +1841,7 @@ (menu (current-buffer)) (pop-up-windows t)) (delete-other-windows) - (with-no-warnings ; We really do want to call `switch-to-buffer' here. - (switch-to-buffer (other-buffer))) + (switch-to-buffer (other-buffer) nil t) (bookmark--jump-via bmrk 'pop-to-buffer) (bury-buffer menu))) === modified file 'lisp/bs.el' --- lisp/bs.el 2011-07-05 15:31:22 +0000 +++ lisp/bs.el 2011-07-14 01:40:30 +0000 @@ -1215,8 +1215,7 @@ ;; We don't want the frame iconified if the only window in the frame ;; happens to be dedicated. (bury-buffer (current-buffer)) - (with-no-warnings ; We really do want to call `switch-to-buffer' here. - (switch-to-buffer next)) + (switch-to-buffer next nil t) (setq bs--cycle-list (append (cdr cycle-list) (list (car cycle-list)))) (bs-message-without-log "Next buffers: %s" @@ -1245,8 +1244,7 @@ bs--cycle-list))) (prev-buffer (car tupel)) (cycle-list (cdr tupel))) - (with-no-warnings ; We really do want to call `switch-to-buffer' here. - (switch-to-buffer prev-buffer)) + (switch-to-buffer prev-buffer nil t) (setq bs--cycle-list (append (last cycle-list) (reverse (cdr (reverse cycle-list))))) (bs-message-without-log "Previous buffers: %s" === modified file 'lisp/net/tramp-cmds.el' --- lisp/net/tramp-cmds.el 2011-07-06 09:48:20 +0000 +++ lisp/net/tramp-cmds.el 2011-07-14 01:40:30 +0000 @@ -308,7 +308,7 @@ ;; There is at least one Tramp buffer. (when buffer-list - (tramp-compat-pop-to-buffer-same-window (list-buffers-noselect nil)) + (switch-to-buffer (list-buffers-noselect nil)) (delete-other-windows) (setq buffer-read-only nil) (goto-char (point-min)) @@ -343,7 +343,7 @@ ;; OK, let's send. First we delete the buffer list. (progn (kill-buffer nil) - (tramp-compat-pop-to-buffer-same-window curbuf) + (switch-to-buffer curbuf) (goto-char (point-max)) (insert "\n\ This is a special notion of the `gnus/message' package. If you === modified file 'lisp/net/tramp-compat.el' --- lisp/net/tramp-compat.el 2011-07-06 09:48:20 +0000 +++ lisp/net/tramp-compat.el 2011-07-14 01:40:30 +0000 @@ -502,15 +502,6 @@ "`dos', `unix', or `mac'"))))) (t (error "Can't change EOL conversion -- is MULE missing?")))) -;; `pop-to-buffer-same-window' has been introduced with Emacs 24.1. -(defun tramp-compat-pop-to-buffer-same-window - (&optional buffer-or-name norecord label) - "Pop to buffer specified by BUFFER-OR-NAME in the selected window." - (if (fboundp 'pop-to-buffer-same-window) - (tramp-compat-funcall - 'pop-to-buffer-same-window buffer-or-name norecord label) - (tramp-compat-funcall 'switch-to-buffer buffer-or-name norecord))) - (add-hook 'tramp-unload-hook (lambda () (unload-feature 'tramp-compat 'force))) ------------------------------------------------------------ revno: 105187 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2011-07-14 03:09:00 +0200 message: Fix typos. diff: === modified file 'admin/charsets/mule-charsets.el' --- admin/charsets/mule-charsets.el 2011-01-15 23:16:57 +0000 +++ admin/charsets/mule-charsets.el 2011-07-14 01:09:00 +0000 @@ -1,4 +1,4 @@ -;; mule-charsets.el -- Generate Mule-orignal charset maps. +;; mule-charsets.el -- Generate Mule-original charset maps. ;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 23:40:11 +0000 +++ lisp/ChangeLog 2011-07-14 01:09:00 +0000 @@ -1,3 +1,9 @@ +2011-07-14 Juanma Barranquero + + * follow.el (follow-debug-message, follow-redisplay): + * jka-cmpr-hook.el (with-auto-compression-mode): + Fix typos in docstrings. + 2011-07-13 Lars Magne Ingebrigtsen * subr.el (with-silent-modifications): Clarify somewhat what the === modified file 'lisp/ChangeLog.6' --- lisp/ChangeLog.6 2011-01-25 04:08:28 +0000 +++ lisp/ChangeLog.6 2011-07-14 01:09:00 +0000 @@ -6892,7 +6892,7 @@ (find-file-noselect): Use it if new optional argument `rawfile' is non-nil. - * startup.el (command-line-1): Add option --eval to evalute an + * startup.el (command-line-1): Add option --eval to evaluate an expression on the command line and print the result. 1995-08-14 Richard Stallman === modified file 'lisp/emacs-lisp/testcover.el' --- lisp/emacs-lisp/testcover.el 2011-06-01 14:19:45 +0000 +++ lisp/emacs-lisp/testcover.el 2011-07-14 01:09:00 +0000 @@ -28,7 +28,7 @@ ;; * Use `testcover-mark-all' to add overlay "splotches" to the Lisp file's ;; buffer to show where coverage is lacking. Normally, a red splotch ;; indicates the form was never evaluated; a brown splotch means it always -;; evaluted to the same value. +;; evaluated to the same value. ;; * Use `testcover-next-mark' (bind it to a key!) to jump to the next spot ;; that has a splotch. === modified file 'lisp/follow.el' --- lisp/follow.el 2011-04-19 13:44:55 +0000 +++ lisp/follow.el 2011-07-14 01:09:00 +0000 @@ -118,7 +118,7 @@ ;; (setq pixel-vertical-clip-threshold 30) -;; The correct way to cofigurate Follow mode, or any other mode for +;; The correct way to configurate Follow mode, or any other mode for ;; that matter, is to create one or more functions that do ;; whatever you would like to do. These functions are then added to ;; a hook. @@ -189,7 +189,7 @@ ;; positions in the text? Here are two simple methods to use: ;; ;; 1) Use multiple frames; `follow' mode only affects windows displayed -;; in the same frame. (My apoligies to you who can't use frames.) +;; in the same frame. (My apologies to you who can't use frames.) ;; ;; 2) Bind `follow-mode' to key so you can turn it off whenever ;; you want to view two locations. Of course, `follow' mode can @@ -209,15 +209,15 @@ ;; ;; Follow mode does this in three places: ;; 1) After each user command. -;; 2) After a process output has been perfomed. +;; 2) After a process output has been performed. ;; 3) When a scrollbar has been moved. ;; ;; This will cover most situations. (Let me know if there are other ;; situations that should be covered.) ;; ;; Note that only the selected window is checked, for the reason of -;; efficiency and code complexity. (I.e. it is possible to make a -;; non-selected windows unaligned. It will, however, pop right back +;; efficiency and code complexity. (I.e. it is possible to make a +;; non-selected window unaligned. It will, however, pop right back ;; when it is selected.) ;;}}} @@ -244,7 +244,7 @@ ;; (funcall (symbol-function 'set) 'bar ...) ;; ;; Note: When this file is interpreted, `eval-when-compile' is -;; evaluted. Since it doesn't hurt to evaluate it, but it is a bit +;; evaluated. Since it doesn't hurt to evaluate it, but it is a bit ;; annoying, we test if the byte-compiler has been loaded. This can, ;; of course, lead to some occasional unintended evaluation... ;; @@ -456,7 +456,7 @@ ;; the variable is not set. (defsubst follow-debug-message (&rest args) - "Like message, but only active when `follow-debug' is non-nil." + "Like `message', but only active when `follow-debug' is non-nil." (if (and (boundp 'follow-debug) follow-debug) (apply 'message args))) @@ -1000,7 +1000,7 @@ res)) -;; Make sure WIN always starts at the beginning of an whole screen +;; Make sure WIN always starts at the beginning of a whole screen ;; line. If WIN is not aligned the start is updated which probably ;; will lead to a redisplay of the screen later on. ;; @@ -1057,8 +1057,8 @@ win)) -;; Lets select a window showing the end. Make sure we only select it if it -;; it wasn't just moved here. (i.e. M-> shall not unconditionally place +;; Lets select a window showing the end. Make sure we only select it if +;; it wasn't just moved here. (I.e. M-> shall not unconditionally place ;; the point in the selected window.) ;; ;; (Compatibility cludge: in Emacs `window-end' is equal to `point-max'; @@ -1134,7 +1134,7 @@ "Reposition the WINDOWS around WIN. Should the point be too close to the roof we redisplay everything from the top. WINDOWS should contain a list of windows to -redisplay, it is assumed that WIN is a member of the list. +redisplay; it is assumed that WIN is a member of the list. Should WINDOWS be nil, the windows displaying the same buffer as WIN, in the current frame, are used. Should WIN be nil, the selected window is used. @@ -1231,7 +1231,7 @@ (setq done t res (point))) ((= win-start start) ; Perfect match, use this value (setq done t res (point))) - ((< win-start start) ; Walked to far, use preious result + ((< win-start start) ; Walked to far, use previous result (setq done t)) (t ; Store result for next iteration (setq res (point)))))) @@ -1241,12 +1241,12 @@ ;;{{{ Avoid tail recenter ;; This sets the window internal flag `force_start'. The effect is that -;; windows only displaying the tail isn't recentered. +;; windows only displaying the tail aren't recentered. ;; Has to be called before every redisplay... (Great isn't it?) ;; ;; XEmacs doesn't recenter the tail, GOOD! ;; -;; A window displaying only the tail, is a windows whose +;; A window displaying only the tail, is a window whose ;; window-start position is equal to (point-max) of the buffer it ;; displays. ;; @@ -1487,12 +1487,12 @@ ;;;; Scroll-bar support code. ;; Why is it needed? Well, if the selected window is in follow mode, -;; all its follower stick to it blindly. If one of them is scrolled, +;; all its followers stick to it blindly. If one of them is scrolled, ;; it immediately returns to the original position when the mouse is ;; released. If the selected window is not a follower of the dragged ;; window the windows will be unaligned. -;; The advices doesn't get compiled. Aestetically, this might be a +;; The advices don't get compiled. Aesthetically, this might be a ;; problem but in practical life it isn't. ;; Discussion: Now when the other windows in the chain follow the @@ -1700,8 +1700,8 @@ ;;}}} ;;{{{ Start/stop interception of processes. -;; Normally, all new processed are intercepted by our `set-process-filter'. -;; This is needed to intercept old processed that were started before we were +;; Normally, all new processes are intercepted by our `set-process-filter'. +;; This is needed to intercept old processes that were started before we were ;; loaded, and processes we have forgotten by calling ;; `follow-stop-intercept-process-output'. @@ -1749,7 +1749,7 @@ ;; The following section is a naive method to make buffers with ;; process output to work with Follow mode. Whenever the start of the -;; window displaying the buffer is moved, we moves it back to its +;; window displaying the buffer is moved, we move it back to its ;; original position and try to select a new window. (If we fail, ;; the normal redisplay functions of Emacs will scroll it right ;; back!) @@ -1767,7 +1767,7 @@ ;; If input is pending, the `sit-for' below won't redraw the ;; display. In that case, calling `follow-avoid-tail-recenter' may - ;; provoke the process hadnling code to sceduling a redisplay. + ;; provoke the process handling code to schedule a redisplay. ;(or (input-pending-p) ; (follow-avoid-tail-recenter)) @@ -1788,7 +1788,7 @@ (inhibit-read-only t)) (save-excursion (goto-char (process-mark proc)) - ;; `insert-before-markers' just in case the users next + ;; `insert-before-markers' just in case the user's next ;; command is M-y. (insert-before-markers output) (set-marker (process-mark proc) (point))) @@ -1848,7 +1848,7 @@ (t (follow-debug-message "filter: nothing"))) - ;; Here we have slected a window. Make sure the + ;; Here we have selected a window. Make sure the ;; windows are aligned and the point is visible ;; in the selected window. (if (and (not (follow-pos-visible @@ -1866,7 +1866,7 @@ ;; return to the original window. (if return-to-orig-win (select-window orig-win)) - ;; Restore the orignal buffer, unless the filter explicitly + ;; Restore the original buffer, unless the filter explicitly ;; changed buffer or killed the old buffer. (if (and (eq buf (current-buffer)) (buffer-name old-buffer)) === modified file 'lisp/gnus/ChangeLog.2' --- lisp/gnus/ChangeLog.2 2011-02-12 23:40:43 +0000 +++ lisp/gnus/ChangeLog.2 2011-07-14 01:09:00 +0000 @@ -9243,7 +9243,7 @@ (nnmaildir--with-nntp-buffer, nnmaildir--with-work-buffer, nnmaildir--with-nov-buffer, nnmaildir--with-move-buffer, nnmaildir--group-ls): New macros/functions. Use them. - (nnmaildir--unlink): Evalutate argument only once. + (nnmaildir--unlink): Evaluate argument only once. 2002-03-27 Jesper Harder === modified file 'lisp/jka-cmpr-hook.el' --- lisp/jka-cmpr-hook.el 2011-01-26 08:36:39 +0000 +++ lisp/jka-cmpr-hook.el 2011-07-14 01:09:00 +0000 @@ -340,7 +340,7 @@ (t (jka-compr-uninstall))))) (defmacro with-auto-compression-mode (&rest body) - "Evalute BODY with automatic file compression and uncompression enabled." + "Evaluate BODY with automatic file compression and uncompression enabled." (declare (indent 0)) (let ((already-installed (make-symbol "already-installed"))) `(let ((,already-installed (jka-compr-installed-p))) === modified file 'lisp/winner.el' --- lisp/winner.el 2011-01-25 04:08:28 +0000 +++ lisp/winner.el 2011-07-14 01:09:00 +0000 @@ -145,7 +145,7 @@ ;;; Saved configurations -;; This variable contains the window cofiguration rings. +;; This variable contains the window configuration rings. ;; The key in this alist is the frame. (defvar winner-ring-alist nil) === modified file 'src/ChangeLog.6' --- src/ChangeLog.6 2011-01-26 08:36:39 +0000 +++ src/ChangeLog.6 2011-07-14 01:09:00 +0000 @@ -4599,7 +4599,7 @@ 1995-08-14 Erik Naggum - * emacs.c (standard_args): Add option --eval to evalute an + * emacs.c (standard_args): Add option --eval to evaluate an expression on the command line and print the result. 1995-08-14 Richard Stallman === modified file 'test/eshell.el' --- test/eshell.el 2011-03-05 20:07:27 +0000 +++ test/eshell.el 2011-07-14 01:09:00 +0000 @@ -396,7 +396,7 @@ (eshell-command-result-p "+ ${+ 1 2} 3" "6\n")) (eshell-deftest var interp-lisp - "Interpolate Lisp form evalution" + "Interpolate Lisp form evaluation" (eshell-command-result-p "+ $(+ 1 2) 3" "6\n")) (eshell-deftest var interp-concat ------------------------------------------------------------ revno: 105186 author: Kevin Ryde committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Thu 2011-07-14 02:14:35 +0200 message: * cl.texi (For Clauses): Add destructuring example processing an alist. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-07-12 12:39:51 +0000 +++ doc/misc/ChangeLog 2011-07-14 00:14:35 +0000 @@ -1,3 +1,8 @@ +2010-07-10 Kevin Ryde + + * cl.texi (For Clauses): Add destructuring example processing an + alist (bug#6596). + 2011-07-12 Lars Magne Ingebrigtsen * org.texi (Special agenda views): Fix double quoting (bug#3509). === modified file 'doc/misc/cl.texi' --- doc/misc/cl.texi 2011-07-03 12:40:59 +0000 +++ doc/misc/cl.texi 2011-07-14 00:14:35 +0000 @@ -2586,7 +2586,14 @@ than values the trailing variables get the value @code{nil}. If @code{nil} is used as a variable name, the corresponding values are ignored. Destructuring may be nested, and dotted -lists of variables like @code{(x . y)} are allowed. +lists of variables like @code{(x . y)} are allowed, so for example +to process an alist + +@example +(loop for (key . value) in '((a . 1) (b . 2)) + collect value) + @result{} (1 2) +@end example @node Iteration Clauses, Accumulation Clauses, For Clauses, Loop Facility @subsection Iteration Clauses ------------------------------------------------------------ revno: 105185 fixes bug(s): http://debbugs.gnu.org/6580 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Thu 2011-07-14 02:02:09 +0200 message: (Documentation Basics): Add a link to the Function Documentation node. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-13 23:17:24 +0000 +++ doc/lispref/ChangeLog 2011-07-14 00:02:09 +0000 @@ -1,3 +1,8 @@ +2011-07-14 Lars Magne Ingebrigtsen + + * help.texi (Documentation Basics): Add a link to the Function + Documentation node (bug#6580). + 2011-07-13 Lars Magne Ingebrigtsen * keymaps.texi (Menu Bar): Mention :visible and :enable === modified file 'doc/lispref/help.texi' --- doc/lispref/help.texi 2011-05-29 22:41:06 +0000 +++ doc/lispref/help.texi 2011-07-14 00:02:09 +0000 @@ -78,11 +78,12 @@ @item @kindex function-documentation The documentation for a function is usually stored in the function -definition itself (@pxref{Lambda Expressions}). The function -@code{documentation} knows how to extract it. You can also put -function documentation in the @code{function-documentation} property -of the function name. That is useful with definitions such as -keyboard macros that can't hold a documentation string. +definition itself (@pxref{Lambda Expressions} and @pxref{Function +Documentation}). The function @code{documentation} knows how to +extract it. You can also put function documentation in the +@code{function-documentation} property of the function name. That is +useful with definitions such as keyboard macros that can't hold a +documentation string. @item @kindex variable-documentation ------------------------------------------------------------ revno: 105184 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Thu 2011-07-14 01:48:35 +0200 message: Fstring_to_char doc clarification * editfns.c (Fstring_to_char): Clarify just what is returned (bug#6576). Text by Eli Zaretskii. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-13 20:33:44 +0000 +++ src/ChangeLog 2011-07-13 23:48:35 +0000 @@ -1,3 +1,8 @@ +2011-07-13 Lars Magne Ingebrigtsen + + * editfns.c (Fstring_to_char): Clarify just what is returned + (bug#6576). Text by Eli Zaretskii. + 2011-07-13 Juanma Barranquero * gnutls.c (init_gnutls_functions): Honor gnutls_log_level (bug#9059). === modified file 'src/editfns.c' --- src/editfns.c 2011-07-04 07:44:38 +0000 +++ src/editfns.c 2011-07-13 23:48:35 +0000 @@ -194,8 +194,12 @@ } DEFUN ("string-to-char", Fstring_to_char, Sstring_to_char, 1, 1, 0, - doc: /* Convert arg STRING to a character, the first character of that string. -A multibyte character is handled correctly. */) + doc: /* Return the first character in STRING. +A multibyte character is handled correctly. +The value returned is a Unicode codepoint if it is below #x110000 (in +hex). Codepoints beyond that are Emacs extensions of Unicode. In +particular, eight-bit characters are returned as codepoints in the +range #x3FFF80 through #x3FFFFF, inclusive. */) (register Lisp_Object string) { register Lisp_Object val; ------------------------------------------------------------ revno: 105183 fixes bug(s): http://debbugs.gnu.org/6525 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Thu 2011-07-14 01:40:11 +0200 message: Doc fix for with-silent-modifications * subr.el (with-silent-modifications): Clarify somewhat what the macro inhibits. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 23:35:36 +0000 +++ lisp/ChangeLog 2011-07-13 23:40:11 +0000 @@ -1,5 +1,8 @@ 2011-07-13 Lars Magne Ingebrigtsen + * subr.el (with-silent-modifications): Clarify somewhat what the + macro inhibits (bug#6525). + * simple.el (eval-expression): Note what it does if called interactively (bug#6495). === modified file 'lisp/subr.el' --- lisp/subr.el 2011-07-13 21:38:56 +0000 +++ lisp/subr.el 2011-07-13 23:40:11 +0000 @@ -3072,8 +3072,15 @@ "Execute BODY, pretending it does not modify the buffer. If BODY performs real modifications to the buffer's text, other than cosmetic ones, undo data may become corrupted. -Typically used around modifications of text-properties which do not really -affect the buffer's content." + +This macro will run BODY normally, but doesn't count its buffer +modifications as being buffer modifications. This affects things +like buffer-modified-p, checking whether the file is locked by +someone else, running buffer modification hooks, and other things +of that nature. + +Typically used around modifications of text-properties which do +not really affect the buffer's content." (declare (debug t) (indent 0)) (let ((modified (make-symbol "modified"))) `(let* ((,modified (buffer-modified-p)) ------------------------------------------------------------ revno: 105182 fixes bug(s): http://debbugs.gnu.org/6495 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Thu 2011-07-14 01:35:36 +0200 message: Doc fix for eval-expression * simple.el (eval-expression): Note what it does if called interactively. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 22:22:08 +0000 +++ lisp/ChangeLog 2011-07-13 23:35:36 +0000 @@ -1,3 +1,8 @@ +2011-07-13 Lars Magne Ingebrigtsen + + * simple.el (eval-expression): Note what it does if called + interactively (bug#6495). + 2011-07-13 Chong Yidong * window.el (switch-to-buffer): New arg FORCE-SAME-WINDOW. Use === modified file 'lisp/simple.el' --- lisp/simple.el 2011-07-13 16:39:49 +0000 +++ lisp/simple.el 2011-07-13 23:35:36 +0000 @@ -1152,6 +1152,8 @@ (defun eval-expression (eval-expression-arg &optional eval-expression-insert-value) "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area. +When called interactively, read an Emacs Lisp expression and +evaluate it. Value is also consed on to front of the variable `values'. Optional argument EVAL-EXPRESSION-INSERT-VALUE non-nil (interactively, with prefix argument) means insert the result into the current buffer ------------------------------------------------------------ revno: 105181 fixes bug(s): http://debbugs.gnu.org/6334 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Thu 2011-07-14 01:17:24 +0200 message: Mention :visible menu bar separators * keymaps.texi (Menu Bar): Mention :visible and :enable (bug#6344). Text by Drew Adams. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-13 21:42:54 +0000 +++ doc/lispref/ChangeLog 2011-07-13 23:17:24 +0000 @@ -1,5 +1,8 @@ 2011-07-13 Lars Magne Ingebrigtsen + * keymaps.texi (Menu Bar): Mention :visible and :enable + (bug#6344). Text by Drew Adams. + * modes.texi (Running Hooks): Mention buffer-local hook variables (bug#6218). === modified file 'doc/lispref/keymaps.texi' --- doc/lispref/keymaps.texi 2011-06-25 18:21:00 +0000 +++ doc/lispref/keymaps.texi 2011-07-13 23:17:24 +0000 @@ -2262,6 +2262,17 @@ the following word. Thus, @code{"--:singleLine"}, is equivalent to @code{"--single-line"}. + You can use a longer form to specify keywords such as @code{:enable} +and @code{:visible} for a menu separator: + +@code{(menu-item @var{separator-type} nil . @var{item-property-list})} + +For example: + +@example +(menu-item "--" nil :visible (boundp 'foo)) +@end example + Some systems and display toolkits don't really handle all of these separator types. If you use a type that isn't supported, the menu displays a similar kind of separator that is supported. ------------------------------------------------------------ revno: 105180 fixes bug(s): http://debbugs.gnu.org/6387 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Thu 2011-07-14 00:22:08 +0200 message: (make-directory): Clarify that an error will be raised if there's an error diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 22:00:48 +0000 +++ lisp/ChangeLog 2011-07-13 22:22:08 +0000 @@ -8,6 +8,9 @@ 2011-07-13 Lars Magne Ingebrigtsen + * files.el (make-directory): Clarify that an error will be raised + if there's an error (bug#6397). + * startup.el (initial-buffer-choice): Add `none' as a choice (bug#6234). === modified file 'lisp/files.el' --- lisp/files.el 2011-07-12 23:25:50 +0000 +++ lisp/files.el 2011-07-13 22:22:08 +0000 @@ -4778,7 +4778,10 @@ Noninteractively, the second (optional) argument PARENTS, if non-nil, says whether to create parent directories that don't -exist. Interactively, this happens by default." +exist. Interactively, this happens by default. + +If creating the directory or directories fail, an error will be +raised." (interactive (list (read-file-name "Make directory: " default-directory default-directory nil nil) ------------------------------------------------------------ revno: 105179 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-07-13 18:00:48 -0400 message: Add FORCE-SAME-WINDOW argument to switch-to-buffer. * lisp/window.el (switch-to-buffer): New arg FORCE-SAME-WINDOW. Use pop-to-buffer buffer-or-name if it is nil. * lisp/emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions): Remove switch-to-buffer. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-07-12 04:54:15 +0000 +++ etc/NEWS 2011-07-13 22:00:48 +0000 @@ -986,6 +986,15 @@ * Lisp changes in Emacs 24.1 +** Window changes + +*** `switch-to-buffer' has a new optional argument FORCE-SAME-WINDOW, +which if non-nil requires the buffer to be displayed in the currently +selected window, signaling an error otherwise. If nil, another window +can be used, e.g. if the selected one is strongly dedicated. + +*** FIXME: buffer-display-alist changes + ** Completion *** New variable completion-extra-properties used to specify extra properties of the current completion: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 21:53:41 +0000 +++ lisp/ChangeLog 2011-07-13 22:00:48 +0000 @@ -1,3 +1,11 @@ +2011-07-13 Chong Yidong + + * window.el (switch-to-buffer): New arg FORCE-SAME-WINDOW. Use + pop-to-buffer buffer-or-name if it is nil. + + * emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions): + Remove switch-to-buffer. + 2011-07-13 Lars Magne Ingebrigtsen * startup.el (initial-buffer-choice): Add `none' as a choice === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2011-07-04 16:08:16 +0000 +++ lisp/emacs-lisp/bytecomp.el 2011-07-13 22:00:48 +0000 @@ -355,7 +355,7 @@ (defvar byte-compile-interactive-only-functions '(beginning-of-buffer end-of-buffer replace-string replace-regexp insert-file insert-buffer insert-file-literally previous-line next-line - goto-line comint-run delete-backward-char switch-to-buffer) + goto-line comint-run delete-backward-char) "List of commands that are not meant to be called from Lisp.") (defvar byte-compile-not-obsolete-vars nil === modified file 'lisp/window.el' --- lisp/window.el 2011-07-10 12:41:47 +0000 +++ lisp/window.el 2011-07-13 22:00:48 +0000 @@ -5925,7 +5925,7 @@ buffer)) (other-buffer))) -(defun switch-to-buffer (buffer-or-name &optional norecord) +(defun switch-to-buffer (buffer-or-name &optional norecord force-same-window) "Switch to buffer BUFFER-OR-NAME in the selected window. If called interactively, prompt for the buffer name using the minibuffer. The variable `confirm-nonexistent-file-or-buffer' @@ -5941,25 +5941,33 @@ Optional argument NORECORD non-nil means do not put the buffer specified by BUFFER-OR-NAME at the front of the buffer list and do not make the window displaying it the most recently selected -one. Return the buffer switched to. - -This function is intended for interactive use only. Lisp -functions should call `pop-to-buffer-same-window' instead." +one. + +If FORCE-SAME-WINDOW is non-nil, BUFFER-OR-NAME must be displayed +in the currently selected window; signal an error if that is +impossible (e.g. if the selected window is minibuffer-only). +If non-nil, BUFFER-OR-NAME may be displayed in another window. + +Return the buffer switched to." (interactive - (list (read-buffer-to-switch "Switch to buffer: "))) + (list (read-buffer-to-switch "Switch to buffer: ") nil nil)) (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name))) - (cond - ;; Don't call set-window-buffer if it's not needed since it - ;; might signal an error (e.g. if the window is dedicated). - ((eq buffer (window-buffer)) nil) - ((window-minibuffer-p) - (error "Cannot switch buffers in minibuffer window")) - ((eq (window-dedicated-p) t) - (error "Cannot switch buffers in a dedicated window")) - (t (set-window-buffer nil buffer))) - (unless norecord - (select-window (selected-window))) - (set-buffer buffer))) + (if (null force-same-window) + (pop-to-buffer buffer-or-name + '(same-window (reuse-window-dedicated . weak)) + norecord nil) + (cond + ;; Don't call set-window-buffer if it's not needed since it + ;; might signal an error (e.g. if the window is dedicated). + ((eq buffer (window-buffer)) nil) + ((window-minibuffer-p) + (error "Cannot switch buffers in minibuffer window")) + ((eq (window-dedicated-p) t) + (error "Cannot switch buffers in a dedicated window")) + (t (set-window-buffer nil buffer))) + (unless norecord + (select-window (selected-window))) + (set-buffer buffer)))) (defun switch-to-buffer-same-frame (buffer-or-name &optional norecord) "Switch to buffer BUFFER-OR-NAME in a window on the selected frame. ------------------------------------------------------------ revno: 105178 fixes bug(s): http://debbugs.gnu.org/6234 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 23:53:41 +0200 message: * startup.el (initial-buffer-choice): Add `none' as a choice diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 21:38:56 +0000 +++ lisp/ChangeLog 2011-07-13 21:53:41 +0000 @@ -1,5 +1,8 @@ 2011-07-13 Lars Magne Ingebrigtsen + * startup.el (initial-buffer-choice): Add `none' as a choice + (bug#6234). + * subr.el (add-hook): Clarify section about buffer-local hooks (bug#6218). === modified file 'lisp/startup.el' --- lisp/startup.el 2011-07-10 02:06:09 +0000 +++ lisp/startup.el 2011-07-13 21:53:41 +0000 @@ -41,13 +41,16 @@ (defcustom initial-buffer-choice nil "Buffer to show after starting Emacs. If the value is nil and `inhibit-startup-screen' is nil, show the -startup screen. If the value is string, visit the specified file or -directory using `find-file'. If t, open the `*scratch*' buffer." +startup screen. If the value is string, visit the specified file +or directory using `find-file'. If t, open the `*scratch*' +buffer. If `none', don't select anything, but show the +buffer (if any) selected by the startup file." :type '(choice (const :tag "Startup screen" nil) (directory :tag "Directory" :value "~/") (file :tag "File" :value "~/.emacs") - (const :tag "Lisp scratch buffer" t)) + (const :tag "Lisp scratch buffer" t) + (const :tag "Select no buffer" 'none)) :version "23.1" :group 'initialization) ------------------------------------------------------------ revno: 105177 fixes bug(s): http://debbugs.gnu.org/6218 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 23:42:54 +0200 message: * modes.texi (Running Hooks): Mention buffer-local hook variables diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-13 15:07:57 +0000 +++ doc/lispref/ChangeLog 2011-07-13 21:42:54 +0000 @@ -1,5 +1,8 @@ 2011-07-13 Lars Magne Ingebrigtsen + * modes.texi (Running Hooks): Mention buffer-local hook variables + (bug#6218). + * objects.texi (General Escape Syntax): "a with grave accent" is ?xe0, not ?x8e0 (bug#5259). === modified file 'doc/lispref/modes.texi' --- doc/lispref/modes.texi 2011-07-10 15:12:36 +0000 +++ doc/lispref/modes.texi 2011-07-13 21:42:54 +0000 @@ -101,6 +101,11 @@ The hook variable's value can also be a single function---either a lambda expression or a symbol with a function definition---which @code{run-hooks} calls. But this usage is obsolete. + +If the hook variable is buffer-local, the buffer-local variable will +be used instead of the global variable. However, if the buffer-local +variable contains the element @code{t}, the global hook variable will +be run as well. @end defun @defun run-hook-with-args hook &rest args @@ -169,11 +174,11 @@ value is a single function; it sets or changes the value to a list of functions. -If @var{local} is non-@code{nil}, that says to add @var{function} to -the buffer-local hook list instead of to the global hook list. If -needed, this makes the hook buffer-local and adds @code{t} to the -buffer-local value. The latter acts as a flag to run the hook -functions in the default value as well as in the local value. +If @var{local} is non-@code{nil}, that says to add @var{function} to the +buffer-local hook list instead of to the global hook list. This makes +the hook buffer-local and adds @code{t} to the buffer-local value. The +latter acts as a flag to run the hook functions in the default value as +well as in the local value. @end defun @defun remove-hook hook function &optional local ------------------------------------------------------------ revno: 105176 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 23:38:56 +0200 message: Clarify manual and `add-hook' doc string about buffer-local hooks diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-07-13 17:55:04 +0000 +++ doc/emacs/ChangeLog 2011-07-13 21:38:56 +0000 @@ -1,3 +1,7 @@ +2011-07-13 Lars Magne Ingebrigtsen + + * custom.texi (Hooks): Mention buffer-local hooks (bug#6218). + 2011-07-13 Glenn Morris * dired.texi (Dired Enter): Mention --dired. (Bug#9039) === modified file 'doc/emacs/custom.texi' --- doc/emacs/custom.texi 2011-07-10 04:05:33 +0000 +++ doc/emacs/custom.texi 2011-07-13 21:38:56 +0000 @@ -820,6 +820,12 @@ can clear out individual functions by calling @code{remove-hook}, or do @code{(setq @var{hook-variable} nil)} to remove everything. +@cindex buffer-local hooks + If the hook variable is buffer-local, the buffer-local variable will +be used instead of the global variable. However, if the buffer-local +variable contains the element @code{t}, the global hook variable will +be run as well. + @node Locals @subsection Local Variables === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 21:27:13 +0000 +++ lisp/ChangeLog 2011-07-13 21:38:56 +0000 @@ -1,5 +1,8 @@ 2011-07-13 Lars Magne Ingebrigtsen + * subr.el (add-hook): Clarify section about buffer-local hooks + (bug#6218). + * dired.el (dired-flagged): Clarify doc string (bug#6117). 2011-07-13 Juanma Barranquero === modified file 'lisp/subr.el' --- lisp/subr.el 2011-07-12 07:26:48 +0000 +++ lisp/subr.el 2011-07-13 21:38:56 +0000 @@ -1262,10 +1262,10 @@ FUNCTION is added at the end. The optional fourth argument, LOCAL, if non-nil, says to modify -the hook's buffer-local value rather than its default value. -This makes the hook buffer-local if needed, and it makes t a member -of the buffer-local value. That acts as a flag to run the hook -functions in the default value as well as in the local value. +the hook's buffer-local value rather than its global value. +This makes the hook buffer-local, and it makes t a member of the +buffer-local value. That acts as a flag to run the hook +functions of the global value as well as in the local value. HOOK should be a symbol, and FUNCTION may be any valid function. If HOOK is void, it is first set to nil. If HOOK's value is a single ------------------------------------------------------------ revno: 105175 fixes bug(s): http://debbugs.gnu.org/6117 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 23:27:13 +0200 message: * dired.el (dired-flagged): Clarify doc string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 18:12:05 +0000 +++ lisp/ChangeLog 2011-07-13 21:27:13 +0000 @@ -1,3 +1,7 @@ +2011-07-13 Lars Magne Ingebrigtsen + + * dired.el (dired-flagged): Clarify doc string (bug#6117). + 2011-07-13 Juanma Barranquero * tabify.el (untabify): Preserve the current column so that point === modified file 'lisp/dired.el' --- lisp/dired.el 2011-07-13 17:34:31 +0000 +++ lisp/dired.el 2011-07-13 21:27:13 +0000 @@ -351,11 +351,11 @@ (defface dired-flagged '((t (:inherit font-lock-warning-face))) - "Face used for flagged files." + "Face used for files flagged for deletion." :group 'dired-faces :version "22.1") (defvar dired-flagged-face 'dired-flagged - "Face name used for flagged files.") + "Face name used for files flagged for deletion.") (defface dired-warning ;; Inherit from font-lock-warning-face since with min-colors 8 ------------------------------------------------------------ revno: 105174 fixes bug(s): http://debbugs.gnu.org/9059 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-07-13 22:33:44 +0200 message: src/gnutls.c (init_gnutls_functions): Honor gnutls_log_level (bug#9059). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-13 04:09:28 +0000 +++ src/ChangeLog 2011-07-13 20:33:44 +0000 @@ -1,3 +1,7 @@ +2011-07-13 Juanma Barranquero + + * gnutls.c (init_gnutls_functions): Honor gnutls_log_level (bug#9059). + 2011-07-13 Eli Zaretskii * buffer.c (mmap_find): Fix a typo. @@ -16,7 +20,7 @@ 2011-07-13 Paul Eggert - * buffer.c (Fget_buffer_create): Initialized inhibit_shrinking. + * buffer.c (Fget_buffer_create): Initialize inhibit_shrinking. The old code sometimes used this field without initializing it. * alloc.c (gc_sweep): Don't read past end of array. @@ -26,7 +30,7 @@ 2011-07-12 Andreas Schwab * character.c (Fcharacterp): Don't advertise optional ignored - argument. (Bug#4026) + argument. (Bug#4026) 2011-07-12 Lars Magne Ingebrigtsen @@ -240,7 +244,7 @@ (char_table_ascii): Uncompress the compressed values. (sub_char_table_ref): New arg is_uniprop. Callers changed. Uncompress the compressed values. - (sub_char_table_ref_and_range): Likewise. + (sub_char_table_ref_and_range): Likewise. (char_table_ref_and_range): Uncompress the compressed values. (sub_char_table_set): New arg is_uniprop. Callers changed. Uncompress the compressed values. @@ -1918,7 +1922,7 @@ (xpm_put_color_table_h): * lisp.h (struct Lisp_Hash_Table): * minibuf.c (Ftry_completion, Fall_completions, Ftest_completion): - * print.c (print): Use 'EMACS_UINT' and 'EMACS_INT' + * print.c (print): Use 'EMACS_UINT' and 'EMACS_INT' for hashes and hash indexes, instead of 'unsigned' and 'int'. * alloc.c (allocate_vectorlike): Check for overflow in vector size calculations. @@ -2215,7 +2219,7 @@ * dispnew.c (shift_glyph_matrix, scrolling_window): Mark scrolled row for fringe update if it has periodic bitmap. - (row_equal_p): Also compare left_fringe_offset, right_fringe_offset, + (row_equal_p): Also compare left_fringe_offset, right_fringe_offset, and fringe_bitmap_periodic_p. * fringe.c (get_fringe_bitmap_data): New function. === modified file 'src/gnutls.c' --- src/gnutls.c 2011-07-05 09:51:56 +0000 +++ src/gnutls.c 2011-07-13 20:33:44 +0000 @@ -143,10 +143,12 @@ init_gnutls_functions (Lisp_Object libraries) { HMODULE library; + Lisp_Object gnutls_log_level = Fsymbol_value (Qgnutls_log_level); + int max_log_level = 1; if (!(library = w32_delayed_load (libraries, Qgnutls_dll))) { - GNUTLS_LOG (1, 1, "GnuTLS library not found"); + GNUTLS_LOG (1, max_log_level, "GnuTLS library not found"); return 0; } @@ -189,7 +191,10 @@ LOAD_GNUTLS_FN (library, gnutls_x509_crt_import); LOAD_GNUTLS_FN (library, gnutls_x509_crt_init); - GNUTLS_LOG2 (1, 1, "GnuTLS library loaded:", + if (NUMBERP (gnutls_log_level)) + max_log_level = XINT (gnutls_log_level); + + GNUTLS_LOG2 (1, max_log_level, "GnuTLS library loaded:", SDATA (Fget (Qgnutls_dll, QCloaded_from))); return 1; } ------------------------------------------------------------ revno: 105173 fixes bug(s): http://debbugs.gnu.org/6032 author: Juanma Barranquero committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 20:12:05 +0200 message: Preserve point when doing untabify * tabify.el (untabify): Preserve the current column so that point doesn't move. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 17:47:17 +0000 +++ lisp/ChangeLog 2011-07-13 18:12:05 +0000 @@ -1,3 +1,8 @@ +2011-07-13 Juanma Barranquero + + * tabify.el (untabify): Preserve the current column so that point + doesn't move (bug#6032). + 2011-07-13 Lars Magne Ingebrigtsen * progmodes/cperl-mode.el (cperl-syntaxify-by-font-lock): Rewrite === modified file 'lisp/tabify.el' --- lisp/tabify.el 2011-01-25 04:08:28 +0000 +++ lisp/tabify.el 2011-07-13 18:12:05 +0000 @@ -34,19 +34,21 @@ START and END, rather than by the position of point and mark. The variable `tab-width' controls the spacing of tab stops." (interactive "r") - (save-excursion - (save-restriction - (narrow-to-region (point-min) end) - (goto-char start) - (while (search-forward "\t" nil t) ; faster than re-search - (forward-char -1) - (let ((tab-beg (point)) - (indent-tabs-mode nil) - column) - (skip-chars-forward "\t") - (setq column (current-column)) - (delete-region tab-beg (point)) - (indent-to column)))))) + (let ((c (current-column))) + (save-excursion + (save-restriction + (narrow-to-region (point-min) end) + (goto-char start) + (while (search-forward "\t" nil t) ; faster than re-search + (forward-char -1) + (let ((tab-beg (point)) + (indent-tabs-mode nil) + column) + (skip-chars-forward "\t") + (setq column (current-column)) + (delete-region tab-beg (point)) + (indent-to column))))) + (move-to-column c))) (defvar tabify-regexp " [ \t]+" "Regexp matching whitespace that tabify should consider. ------------------------------------------------------------ revno: 105172 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-07-13 13:55:04 -0400 message: * doc/emacs/dired.texi (Dired Enter): Mention --dired. (Bug#9039) diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-07-13 16:58:15 +0000 +++ doc/emacs/ChangeLog 2011-07-13 17:55:04 +0000 @@ -1,3 +1,7 @@ +2011-07-13 Glenn Morris + + * dired.texi (Dired Enter): Mention --dired. (Bug#9039) + 2011-07-13 Lars Magne Ingebrigtsen * mark.texi (Mark Ring): Clarify how many locations are saved === modified file 'doc/emacs/dired.texi' --- doc/emacs/dired.texi 2011-07-02 15:42:37 +0000 +++ doc/emacs/dired.texi 2011-07-13 17:55:04 +0000 @@ -81,6 +81,13 @@ single characters) requiring no arguments, and long options (starting with @samp{--}) whose arguments are specified with @samp{=}. +@vindex dired-use-ls-dired + Note that Dired automatically adds the option @samp{--dired}, if +your @code{ls} program supports it, unless you explicitly set +the variable @code{dired-use-ls-dired} to @code{nil}. Without this +option, Dired will have trouble parsing some @samp{unusual} file-names. +See the documentation of @code{dired-use-ls-dired} for more details. + On MS-Windows and MS-DOS systems, Emacs @emph{emulates} @code{ls}; see @ref{ls in Lisp}, for options and peculiarities of that emulation. ------------------------------------------------------------ revno: 105171 fixes bug(s): http://debbugs.gnu.org/5986 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 19:47:17 +0200 message: Doc string fix. * progmodes/cperl-mode.el (cperl-syntaxify-by-font-lock): Rewrite to avoid awkward possessive "s". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 17:34:31 +0000 +++ lisp/ChangeLog 2011-07-13 17:47:17 +0000 @@ -1,3 +1,8 @@ +2011-07-13 Lars Magne Ingebrigtsen + + * progmodes/cperl-mode.el (cperl-syntaxify-by-font-lock): Rewrite + to avoid awkward possessive "s" (bug#5986). + 2011-07-13 Glenn Morris * dired.el (dired-use-ls-dired): Doc fix. (Bug#9039). === modified file 'lisp/progmodes/cperl-mode.el' --- lisp/progmodes/cperl-mode.el 2011-06-26 03:42:22 +0000 +++ lisp/progmodes/cperl-mode.el 2011-07-13 17:47:17 +0000 @@ -613,7 +613,7 @@ (defcustom cperl-syntaxify-by-font-lock (and cperl-can-font-lock (boundp 'parse-sexp-lookup-properties)) - "*Non-nil means that CPerl uses `font-lock's routines for syntaxification." + "*Non-nil means that CPerl uses the `font-lock' routines for syntaxification." :type '(choice (const message) boolean) :group 'cperl-speed) ------------------------------------------------------------ revno: 105170 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-07-13 13:34:31 -0400 message: Small dired fixes related to bug#9039. * lisp/dired.el (dired-use-ls-dired): Doc fix. (dired-insert-directory): Give a message the first time if ls is found not to support --dired. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 16:39:49 +0000 +++ lisp/ChangeLog 2011-07-13 17:34:31 +0000 @@ -1,3 +1,9 @@ +2011-07-13 Glenn Morris + + * dired.el (dired-use-ls-dired): Doc fix. (Bug#9039). + (dired-insert-directory): Give a message the first time + if ls is found not to support --dired. + 2011-07-13 Lars Magne Ingebrigtsen * simple.el (toggle-truncate-lines): Clarify what is toggled === modified file 'lisp/dired.el' --- lisp/dired.el 2011-07-13 15:15:26 +0000 +++ lisp/dired.el 2011-07-13 17:34:31 +0000 @@ -78,10 +78,22 @@ :type 'file) (defcustom dired-use-ls-dired 'unspecified - "Non-nil means Dired should use \"ls --dired\". + "Non-nil means Dired should pass the \"--dired\" option to \"ls\". The special value of `unspecified' means to check explicitly, and save the result in this variable. This is performed the first -time `dired-insert-directory' is called." +time `dired-insert-directory' is called. + +Note that if you set this option to nil, either through choice or +because your \"ls\" program does not support \"--dired\", Dired +will fail to parse some \"unusual\" file names, e.g. those with leading +spaces. You might want to install ls from GNU Coreutils, which does +support this option. Alternatively, you might want to use Emacs's +own emulation of \"ls\", by using: + \(setq ls-lisp-use-insert-directory-program nil) + \(require 'ls-lisp) +This is used by default on MS Windows, which does not have an \"ls\" program. +Note that `ls-lisp' does not support as many options as GNU ls, though. +For more details, see Info node `(emacs)ls in Lisp'." :group 'dired :type '(choice (const :tag "Check for --dired support" unspecified) (const :tag "Do not use --dired" nil) @@ -1119,9 +1131,13 @@ (or (if (eq dired-use-ls-dired 'unspecified) ;; Check whether "ls --dired" gives exit code 0, and ;; save the answer in `dired-use-ls-dired'. - (setq dired-use-ls-dired - (eq (call-process insert-directory-program nil nil nil "--dired") - 0)) + (or (setq dired-use-ls-dired + (eq 0 (call-process insert-directory-program + nil nil nil "--dired"))) + (progn + (message "ls does not support --dired; \ +see `dired-use-ls-dired' for more details.") + nil)) dired-use-ls-dired) (file-remote-p dir))) (setq switches (concat "--dired " switches))) ------------------------------------------------------------ revno: 105169 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 18:58:15 +0200 message: Clarify `mark-ring-max' documentation. * mark.texi (Mark Ring): Clarify how many locations are saved (bug#5770). (Global Mark Ring): Ditto. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-07-12 22:39:21 +0000 +++ doc/emacs/ChangeLog 2011-07-13 16:58:15 +0000 @@ -1,3 +1,9 @@ +2011-07-13 Lars Magne Ingebrigtsen + + * mark.texi (Mark Ring): Clarify how many locations are saved + (bug#5770). + (Global Mark Ring): Ditto. + 2011-07-12 Lars Magne Ingebrigtsen * text.texi (Table Recognition): Use "at point" instead of "under === modified file 'doc/emacs/mark.texi' --- doc/emacs/mark.texi 2011-07-11 18:40:48 +0000 +++ doc/emacs/mark.texi 2011-07-13 16:58:15 +0000 @@ -253,7 +253,9 @@ @cindex mark ring Aside from delimiting the region, the mark is also useful for remembering spots that you may want to go back to. Each buffer -remembers 16 previous locations of the mark, in the @dfn{mark ring}. +remembers @code{mark-ring-max} previous locations of the mark, in the +@dfn{mark ring}. This defaults to 16 locations. + Commands that set the mark also push the old mark onto this ring. @table @kbd @@ -315,10 +317,12 @@ @section The Global Mark Ring @cindex global mark ring +@vindex global-mark-ring-max In addition to the ordinary mark ring that belongs to each buffer, Emacs has a single @dfn{global mark ring}. Each time you set a mark, in any buffer, this is recorded in the global mark ring in addition to -the current buffer's own mark ring. +the current buffer's own mark ring. The length of this ring can be +controlled by @code{global-mark-ring-max}, and is 16 by default. @kindex C-x C-@key{SPC} @findex pop-global-mark ------------------------------------------------------------ revno: 105168 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 18:39:49 +0200 message: Clarify doc string * simple.el (toggle-truncate-lines): Clarify what is toggled (bug#5580). Text by Drew Adams. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 16:15:07 +0000 +++ lisp/ChangeLog 2011-07-13 16:39:49 +0000 @@ -1,3 +1,8 @@ +2011-07-13 Lars Magne Ingebrigtsen + + * simple.el (toggle-truncate-lines): Clarify what is toggled + (bug#5580). Text by Drew Adams. + 2011-07-13 Chong Yidong * simple.el (blink-matching-open): Make the error message from the === modified file 'lisp/simple.el' --- lisp/simple.el 2011-07-13 16:15:07 +0000 +++ lisp/simple.el 2011-07-13 16:39:49 +0000 @@ -5303,11 +5303,12 @@ (defvaralias 'indicate-unused-lines 'indicate-empty-lines) (defun toggle-truncate-lines (&optional arg) - "Toggle whether to fold or truncate long lines for the current buffer. + "Toggle truncating of long lines for the current buffer. +When truncating is off, long lines are folded. With prefix argument ARG, truncate long lines if ARG is positive, -otherwise don't truncate them. Note that in side-by-side windows, -this command has no effect if `truncate-partial-width-windows' -is non-nil." +otherwise fold them. Note that in side-by-side windows, this +command has no effect if `truncate-partial-width-windows' is +non-nil." (interactive "P") (setq truncate-lines (if (null arg) ------------------------------------------------------------ revno: 105167 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-07-13 12:15:07 -0400 message: * simple.el (blink-matching-open): Make error message from last change less verbose. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 15:33:08 +0000 +++ lisp/ChangeLog 2011-07-13 16:15:07 +0000 @@ -1,3 +1,8 @@ +2011-07-13 Chong Yidong + + * simple.el (blink-matching-open): Make the error message from the + last change less verbose. + 2011-07-13 Dan Nicolaescu * font-lock.el (font-lock-comment-face): Use the high contrast === modified file 'lisp/simple.el' --- lisp/simple.el 2011-07-13 14:57:28 +0000 +++ lisp/simple.el 2011-07-13 16:15:07 +0000 @@ -5487,19 +5487,15 @@ (when (and (not (bobp)) blink-matching-paren) (let* ((oldpos (point)) - (limit-message "") (message-log-max nil) ; Don't log messages about paren matching. (blinkpos (save-excursion (save-restriction - (when blink-matching-paren-distance - (let ((start (- (point) blink-matching-paren-distance))) - (when (> start (minibuffer-prompt-end)) - (setq limit-message " within the limit")) - (narrow-to-region - (max (minibuffer-prompt-end) ;(point-min) unless minibuf. - start) - oldpos))) + (if blink-matching-paren-distance + (narrow-to-region + (max (minibuffer-prompt-end) ;(point-min) unless minibuf. + (- (point) blink-matching-paren-distance)) + oldpos)) (let ((parse-sexp-ignore-comments (and parse-sexp-ignore-comments (not blink-matching-paren-dont-ignore-comments)))) @@ -5521,11 +5517,11 @@ (mismatch (if blinkpos (if (minibufferp) - (minibuffer-message "Mismatched parentheses%s" limit-message) - (message "Mismatched parentheses%s" limit-message)) + (minibuffer-message "Mismatched parentheses") + (message "Mismatched parentheses")) (if (minibufferp) - (minibuffer-message "Unmatched parenthesis%s" limit-message) - (message "Unmatched parenthesis%s" limit-message)))) + (minibuffer-message "No matching parenthesis found") + (message "No matching parenthesis found")))) ((not blinkpos) nil) ((pos-visible-in-window-p blinkpos) ;; Matching open within window, temporarily move to blinkpos but only ------------------------------------------------------------ revno: 105166 fixes bug(s): http://debbugs.gnu.org/4221 author: Dan Nicolaescu committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 17:33:08 +0200 message: Use "yellow" on low color terminals for comments * font-lock.el (font-lock-comment-face): Use the high contrast "yellow" color for font-lock-comment-face on low color terminals using a dark background color. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 15:15:26 +0000 +++ lisp/ChangeLog 2011-07-13 15:33:08 +0000 @@ -1,3 +1,9 @@ +2011-07-13 Dan Nicolaescu + + * font-lock.el (font-lock-comment-face): Use the high contrast + "yellow" color for font-lock-comment-face on low color terminals + using a dark background color (bug#4221). + 2011-07-13 Lars Magne Ingebrigtsen * dired.el (dired-insert-set-properties): Make the doc string === modified file 'lisp/font-lock.el' --- lisp/font-lock.el 2011-07-05 15:23:15 +0000 +++ lisp/font-lock.el 2011-07-13 15:33:08 +0000 @@ -1856,19 +1856,13 @@ (((class color) (min-colors 8) (background light)) (:foreground "red")) (((class color) (min-colors 8) (background dark)) - ) + (:foreground "yellow")) (t (:weight bold :slant italic))) "Font Lock mode face used to highlight comments." :group 'font-lock-faces) (defface font-lock-comment-delimiter-face - '((default :inherit font-lock-comment-face) - (((class grayscale))) - (((class color) (min-colors 16))) - (((class color) (min-colors 8) (background light)) - :foreground "red") - (((class color) (min-colors 8) (background dark)) - :foreground "red1")) + '((default :inherit font-lock-comment-face)) "Font Lock mode face used to highlight comment delimiters." :group 'font-lock-faces) ------------------------------------------------------------ revno: 105165 fixes bug(s): http://debbugs.gnu.org/5325 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 17:15:26 +0200 message: (dired-insert-set-properties): Make the doc string reflect what it does now diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 14:57:28 +0000 +++ lisp/ChangeLog 2011-07-13 15:15:26 +0000 @@ -1,5 +1,8 @@ 2011-07-13 Lars Magne Ingebrigtsen + * dired.el (dired-insert-set-properties): Make the doc string + reflect what it does now (bug#5325). + * simple.el (blink-matching-open): Say that we were unable to find the match within the limit, if we're limited (bug#5122). === modified file 'lisp/dired.el' --- lisp/dired.el 2011-07-12 10:24:54 +0000 +++ lisp/dired.el 2011-07-13 15:15:26 +0000 @@ -1175,7 +1175,7 @@ (insert " wildcard " (file-name-nondirectory dir) "\n"))))) (defun dired-insert-set-properties (beg end) - "Make the file names highlight when the mouse is on them." + "Add various text properties to the lines in the region." (save-excursion (goto-char beg) (while (< (point) end) ------------------------------------------------------------ revno: 105164 fixes bug(s): http://debbugs.gnu.org/5259 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 17:07:57 +0200 message: (General Escape Syntax): "a with grave accent" is ?xe0, not ?x8e0. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-12 22:09:28 +0000 +++ doc/lispref/ChangeLog 2011-07-13 15:07:57 +0000 @@ -1,3 +1,8 @@ +2011-07-13 Lars Magne Ingebrigtsen + + * objects.texi (General Escape Syntax): "a with grave accent" is + ?xe0, not ?x8e0 (bug#5259). + 2011-07-12 Chong Yidong * display.texi (Face Attributes, Font Selection): Add references === modified file 'doc/lispref/objects.texi' --- doc/lispref/objects.texi 2011-06-06 19:43:39 +0000 +++ doc/lispref/objects.texi 2011-07-13 15:07:57 +0000 @@ -392,7 +392,7 @@ and the hexadecimal character code. You can use any number of hex digits, so you can represent any character code in this way. Thus, @samp{?\x41} for the character @kbd{A}, @samp{?\x1} for the -character @kbd{C-a}, and @code{?\x8e0} for the Latin-1 character +character @kbd{C-a}, and @code{?\xe0} for the Latin-1 character @iftex @samp{@`a}. @end iftex @@ -1037,7 +1037,7 @@ greater than 256.) Any character which is not a valid hex digit terminates this construct. If the next character in the string could be interpreted as a hex digit, write @w{@samp{\ }} (backslash and space) to -terminate the hex escape---for example, @w{@samp{\x8e0\ }} represents +terminate the hex escape---for example, @w{@samp{\xe0\ }} represents one character, @samp{a} with grave accent. @w{@samp{\ }} in a string constant is just like backslash-newline; it does not contribute any character to the string, but it does terminate the preceding hex escape. ------------------------------------------------------------ revno: 105163 fixes bug(s): http://debbugs.gnu.org/5122 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 16:57:28 +0200 message: Say that we were unable to find the match within the limit * simple.el (blink-matching-open): Say that we were unable to find the match within the limit, if we're limited (bug#5122). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 14:34:10 +0000 +++ lisp/ChangeLog 2011-07-13 14:57:28 +0000 @@ -1,5 +1,8 @@ 2011-07-13 Lars Magne Ingebrigtsen + * simple.el (blink-matching-open): Say that we were unable to find + the match within the limit, if we're limited (bug#5122). + * international/mule-cmds.el (prefer-coding-system): Add an example (bug#4869). === modified file 'lisp/simple.el' --- lisp/simple.el 2011-07-06 19:44:09 +0000 +++ lisp/simple.el 2011-07-13 14:57:28 +0000 @@ -5487,15 +5487,19 @@ (when (and (not (bobp)) blink-matching-paren) (let* ((oldpos (point)) + (limit-message "") (message-log-max nil) ; Don't log messages about paren matching. (blinkpos (save-excursion (save-restriction - (if blink-matching-paren-distance - (narrow-to-region - (max (minibuffer-prompt-end) ;(point-min) unless minibuf. - (- (point) blink-matching-paren-distance)) - oldpos)) + (when blink-matching-paren-distance + (let ((start (- (point) blink-matching-paren-distance))) + (when (> start (minibuffer-prompt-end)) + (setq limit-message " within the limit")) + (narrow-to-region + (max (minibuffer-prompt-end) ;(point-min) unless minibuf. + start) + oldpos))) (let ((parse-sexp-ignore-comments (and parse-sexp-ignore-comments (not blink-matching-paren-dont-ignore-comments)))) @@ -5517,11 +5521,11 @@ (mismatch (if blinkpos (if (minibufferp) - (minibuffer-message "Mismatched parentheses") - (message "Mismatched parentheses")) + (minibuffer-message "Mismatched parentheses%s" limit-message) + (message "Mismatched parentheses%s" limit-message)) (if (minibufferp) - (minibuffer-message "Unmatched parenthesis") - (message "Unmatched parenthesis")))) + (minibuffer-message "Unmatched parenthesis%s" limit-message) + (message "Unmatched parenthesis%s" limit-message)))) ((not blinkpos) nil) ((pos-visible-in-window-p blinkpos) ;; Matching open within window, temporarily move to blinkpos but only ------------------------------------------------------------ revno: 105162 fixes bug(s): http://debbugs.gnu.org/4869 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 16:34:10 +0200 message: (prefer-coding-system): Add an example diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 14:20:45 +0000 +++ lisp/ChangeLog 2011-07-13 14:34:10 +0000 @@ -1,5 +1,8 @@ 2011-07-13 Lars Magne Ingebrigtsen + * international/mule-cmds.el (prefer-coding-system): Add an + example (bug#4869). + * progmodes/etags.el (tags-search): Document `file-list-form' (bug#4731). === modified file 'lisp/international/mule-cmds.el' --- lisp/international/mule-cmds.el 2011-07-06 22:43:48 +0000 +++ lisp/international/mule-cmds.el 2011-07-13 14:34:10 +0000 @@ -397,7 +397,11 @@ systems set by this function will use that type of EOL conversion. A coding system that requires automatic detection of text+encoding -\(e.g. undecided, unix) can't be preferred." +\(e.g. undecided, unix) can't be preferred. + +To prefer, for instance, utf-8, say the following: + + \(prefer-coding-system 'utf-8)" (interactive "zPrefer coding system: ") (if (not (and coding-system (coding-system-p coding-system))) (error "Invalid coding system `%s'" coding-system)) ------------------------------------------------------------ revno: 105161 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 16:20:45 +0200 message: (tags-search): Document `file-list-form' diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 13:49:55 +0000 +++ lisp/ChangeLog 2011-07-13 14:20:45 +0000 @@ -1,3 +1,8 @@ +2011-07-13 Lars Magne Ingebrigtsen + + * progmodes/etags.el (tags-search): Document `file-list-form' + (bug#4731). + 2011-07-13 Lawrence Mitchell * net/browse-url.el (browse-url-default-browser) === modified file 'lisp/progmodes/etags.el' --- lisp/progmodes/etags.el 2011-05-28 02:10:32 +0000 +++ lisp/progmodes/etags.el 2011-07-13 14:20:45 +0000 @@ -1860,7 +1860,11 @@ Stops when a match is found. To continue searching for next match, use command \\[tags-loop-continue]. -See documentation of variable `tags-file-name'." +If `file-list-form' is non-nil, it should be a form that, when +evaluated, will return a list of file names. The search will be +restricted to these files. + +Aleso see the documentation of the `tags-file-name' variable." (interactive "sTags search (regexp): ") (if (and (equal regexp "") (eq (car tags-loop-scan) 're-search-forward) ------------------------------------------------------------ revno: 105160 author: Chris Newton committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 16:12:06 +0200 message: Copy over `url-show-status' to the async buffer * url-http.el (url-http): Copy over `url-show-status' to the async buffer so that `url-display-percentage' does the right thing (bug#4680). diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2011-07-06 07:47:15 +0000 +++ lisp/url/ChangeLog 2011-07-13 14:12:06 +0000 @@ -1,3 +1,9 @@ +2011-07-13 Chris Newton (tiny change) + + * url-http.el (url-http): Copy over `url-show-status' to the async + buffer so that `url-display-percentage' does the right thing + (bug#4680). + 2011-07-06 Nick Dokos (tiny change) * url-cache.el (url-cache-extract): Set buffer multibyte flag to === modified file 'lisp/url/url-http.el' --- lisp/url/url-http.el 2011-07-03 16:03:47 +0000 +++ lisp/url/url-http.el 2011-07-13 14:12:06 +0000 @@ -1172,6 +1172,7 @@ url-http-after-change-function url-callback-function url-callback-arguments + url-show-status url-http-method url-http-extra-headers url-http-data @@ -1206,6 +1207,7 @@ url-http-chunked-start url-callback-function url-callback-arguments + url-show-status url-http-process url-http-method url-http-extra-headers ------------------------------------------------------------ revno: 105159 fixes bug(s): http://debbugs.gnu.org/4300 author: Lawrence Mitchell committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 15:49:55 +0200 message: Make the default browser choice a bit more logical * net/browse-url.el (browse-url-default-browser) (browse-url-browser-function): Make the default browser choice a bit more logical. Also clean up the doc string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 13:39:23 +0000 +++ lisp/ChangeLog 2011-07-13 13:49:55 +0000 @@ -1,3 +1,9 @@ +2011-07-13 Lawrence Mitchell + + * net/browse-url.el (browse-url-default-browser) + (browse-url-browser-function): Make the default browser choice a + bit more logical (bug#4300). Also clean up the doc string. + 2011-07-13 Juanma Barranquero * bindings.el (completion-ignored-extensions): Add OpenMCL/Clozure === modified file 'lisp/net/browse-url.el' --- lisp/net/browse-url.el 2011-06-25 09:31:24 +0000 +++ lisp/net/browse-url.el 2011-07-13 13:49:55 +0000 @@ -214,13 +214,7 @@ ;;;###autoload (defcustom browse-url-browser-function - (cond - ((memq system-type '(windows-nt ms-dos cygwin)) - 'browse-url-default-windows-browser) - ((memq system-type '(darwin)) - 'browse-url-default-macosx-browser) - (t - 'browse-url-default-browser)) + 'browse-url-default-browser "Function to display the current buffer in a WWW browser. This is used by the `browse-url-at-point', `browse-url-at-mouse', and `browse-url-of-file' commands. @@ -908,12 +902,13 @@ the effect of `browse-url-new-window-flag'. When called non-interactively, optional second argument NEW-WINDOW is -used instead of `browse-url-new-window-flag'. - -The order attempted is gnome-moz-remote, Mozilla, Firefox, -Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, and then W3." +used instead of `browse-url-new-window-flag'." (apply (cond + ((memq system-type '(windows-nt ms-dos cygwin)) + 'browse-url-default-windows-browser) + ((memq system-type '(darwin)) + 'browse-url-default-macosx-browser) ((browse-url-can-use-xdg-open) 'browse-url-xdg-open) ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz) ((executable-find browse-url-mozilla-program) 'browse-url-mozilla) ------------------------------------------------------------ revno: 105158 fixes bug(s): http://debbugs.gnu.org/4440 author: Juanma Barranquero committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 15:39:23 +0200 message: (completion-ignored-extensions): Add OpenMCL/Clozure binary endings. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 13:35:02 +0000 +++ lisp/ChangeLog 2011-07-13 13:39:23 +0000 @@ -1,3 +1,8 @@ +2011-07-13 Juanma Barranquero + + * bindings.el (completion-ignored-extensions): Add OpenMCL/Clozure + binary endings (bug#4440). + 2011-07-13 Lars Magne Ingebrigtsen * info.el (info-insert-file-contents): Inhibit jka-compr messages, === modified file 'lisp/bindings.el' --- lisp/bindings.el 2011-07-07 01:46:59 +0000 +++ lisp/bindings.el 2011-07-13 13:39:23 +0000 @@ -594,9 +594,12 @@ ".fas" ".lib" ".mem" ;; CMUCL ".x86f" ".sparcf" - ;; Other CL implementations (Allegro, LispWorks, OpenMCL) - ".fasl" ".ufsl" ".fsl" ".dxl" ".pfsl" ".dfsl" - ".p64fsl" ".d64fsl" ".dx64fsl" + ;; OpenMCL / Clozure CL + ".dfsl" ".pfsl" ".d64fsl" ".p64fsl" ".lx64fsl" ".lx32fsl" + ".dx64fsl" ".dx32fsl" ".fx64fsl" ".fx32fsl" ".sx64fsl" + ".sx32fsl" ".wx64fsl" ".wx32fsl" + ;; Other CL implementations (Allegro, LispWorks) + ".fasl" ".ufsl" ".fsl" ".dxl" ;; Libtool ".lo" ".la" ;; Gettext ------------------------------------------------------------ revno: 105157 fixes bug(s): http://debbugs.gnu.org/8971 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 15:35:02 +0200 message: (info-insert-file-contents): Inhibit jka-compr messages, which can be pretty annoying diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 13:25:29 +0000 +++ lisp/ChangeLog 2011-07-13 13:35:02 +0000 @@ -1,5 +1,8 @@ 2011-07-13 Lars Magne Ingebrigtsen + * info.el (info-insert-file-contents): Inhibit jka-compr messages, + which can be pretty annoying (bug#8971). + * jka-compr.el (jka-compr-verbose): New variable, and use throughout (bug#8971). === modified file 'lisp/info.el' --- lisp/info.el 2011-07-13 13:10:54 +0000 +++ lisp/info.el 2011-07-13 13:35:02 +0000 @@ -464,6 +464,7 @@ "Insert the contents of an Info file in the current buffer. Do the right thing if the file has been compressed or zipped." (let* ((tail Info-suffix-list) + (jka-compr-verbose nil) (lfn (if (fboundp 'msdos-long-file-names) (msdos-long-file-names) t)) ------------------------------------------------------------ revno: 105156 fixes bug(s): http://debbugs.gnu.org/8971 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 15:25:29 +0200 message: * jka-compr.el (jka-compr-verbose): New variable, and use throughout. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 13:10:54 +0000 +++ lisp/ChangeLog 2011-07-13 13:25:29 +0000 @@ -1,5 +1,8 @@ 2011-07-13 Lars Magne Ingebrigtsen + * jka-compr.el (jka-compr-verbose): New variable, and use + throughout (bug#8971). + * info.el (Info-find-file): Fall back on the installation directory if we can't find the info node anywhere else. === modified file 'lisp/jka-compr.el' --- lisp/jka-compr.el 2011-04-19 13:44:55 +0000 +++ lisp/jka-compr.el 2011-07-13 13:25:29 +0000 @@ -97,6 +97,11 @@ :type 'string :group 'jka-compr) +(defcustom jka-compr-verbose t + "If non-nil, output messages whenever compressing or uncompressing files." + :type 'boolean + :group 'jka-compr) + (defvar jka-compr-use-shell (not (memq system-type '(ms-dos windows-nt)))) @@ -309,6 +314,7 @@ (and compress-message + jka-compr-verbose (message "%s %s..." compress-message base-name)) (jka-compr-run-real-handler 'write-region @@ -341,6 +347,7 @@ (and compress-message + jka-compr-verbose (message "%s %s...done" compress-message base-name)) (cond @@ -404,6 +411,7 @@ (and uncompress-message + jka-compr-verbose (message "%s %s..." uncompress-message base-name)) (condition-case error-code @@ -479,6 +487,7 @@ (and uncompress-message + jka-compr-verbose (message "%s %s...done" uncompress-message base-name)) (and @@ -534,6 +543,7 @@ (and uncompress-message + jka-compr-verbose (message "%s %s..." uncompress-message base-name)) ;; Here we must read the output of uncompress program @@ -554,6 +564,7 @@ (and uncompress-message + jka-compr-verbose (message "%s %s...done" uncompress-message base-name)) (write-region ------------------------------------------------------------ revno: 105155 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 15:10:54 +0200 message: (Info-find-file): Fall back on the installation directory if we can't find the info node anywhere else. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-13 07:58:34 +0000 +++ lisp/ChangeLog 2011-07-13 13:10:54 +0000 @@ -1,3 +1,8 @@ +2011-07-13 Lars Magne Ingebrigtsen + + * info.el (Info-find-file): Fall back on the installation + directory if we can't find the info node anywhere else. + 2011-07-13 Sergei Organov (tiny change) * vc/vc.el (vc-revert-file): === modified file 'lisp/info.el' --- lisp/info.el 2011-07-07 20:35:28 +0000 +++ lisp/info.el 2011-07-13 13:10:54 +0000 @@ -728,6 +728,11 @@ (append Info-directory-list Info-additional-directory-list) Info-directory-list))))) + ;; Fall back on the installation directory if we can't find + ;; the info node anywhere else. + (when installation-directory + (setq dirs (append dirs (list (expand-file-name + "info" installation-directory))))) ;; Search the directory list for file FILENAME. (while (and dirs (not found)) (setq temp (expand-file-name filename (car dirs))) ------------------------------------------------------------ revno: 105154 committer: Jan D. branch nick: trunk timestamp: Wed 2011-07-13 12:36:12 +0200 message: * configure.in (GSETTINGS): Check for gio-2.0 >= 2.26. diff: === modified file 'ChangeLog' --- ChangeLog 2011-07-11 23:13:28 +0000 +++ ChangeLog 2011-07-13 10:36:12 +0000 @@ -1,3 +1,7 @@ +2011-07-13 Jan Djärv + + * configure.in (GSETTINGS): Check for gio-2.0 >= 2.26. + 2011-07-11 YAMAMOTO Mitsuharu * configure.in (LD_SWITCH_SYSTEM_TEMACS): Add -fno-pie on Darwin === modified file 'configure.in' --- configure.in 2011-07-11 23:13:28 +0000 +++ configure.in 2011-07-13 10:36:12 +0000 @@ -1987,7 +1987,7 @@ dnl GSettings has been tested under GNU/Linux only. HAVE_GSETTINGS=no if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then - PKG_CHECK_MODULES(GSETTINGS, glib-2.0 >= 2.26, HAVE_GSETTINGS=yes, HAVE_GSETTINGS=no) + PKG_CHECK_MODULES(GSETTINGS, gio-2.0 >= 2.26, HAVE_GSETTINGS=yes, HAVE_GSETTINGS=no) if test "$HAVE_GSETTINGS" = "yes"; then AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.]) SETTINGS_CFLAGS="$GSETTINGS_CFLAGS"