Now on revision 106178. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 106178 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-10-24 06:18:38 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2011-10-20 10:20:23 +0000 +++ autogen/configure 2011-10-24 10:18:38 +0000 @@ -10380,7 +10380,8 @@ if test "$HAVE_PTHREAD" = yes; then case "${canonical}" in *-hpux*) ;; - *) LIB_PTHREAD="-lpthread" ;; + *) LIB_PTHREAD="-lpthread" + LIBS="$LIB_PTHREAD $LIBS" ;; esac $as_echo "#define HAVE_PTHREAD 1" >>confdefs.h ------------------------------------------------------------ revno: 106177 committer: Michael Albinus branch nick: trunk timestamp: Mon 2011-10-24 10:02:02 +0200 message: * notifications.el: Add the requirement of a running D-Bus session bus to the Commentary. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-24 05:56:04 +0000 +++ lisp/ChangeLog 2011-10-24 08:02:02 +0000 @@ -1,3 +1,8 @@ +2011-10-24 Michael Albinus + + * notifications.el: Add the requirement of a running D-Bus session + bus to the Commentary. + 2011-10-24 Juri Linkov * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to === modified file 'lisp/notifications.el' --- lisp/notifications.el 2011-10-01 13:19:17 +0000 +++ lisp/notifications.el 2011-10-24 08:02:02 +0000 @@ -30,6 +30,9 @@ ;; ;; (require 'notifications) +;; For proper usage, Emacs must be started in an environment with an +;; active D-Bus session bus. + ;;; Code: (eval-when-compile (require 'cl)) ------------------------------------------------------------ revno: 106176 fixes bug(s): http://debbugs.gnu.org/9364 committer: Juri Linkov branch nick: trunk timestamp: Mon 2011-10-24 08:56:04 +0300 message: * lisp/isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to `search-whitespace-regexp' only when `isearch-regexp' is non-nil. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-24 05:47:05 +0000 +++ lisp/ChangeLog 2011-10-24 05:56:04 +0000 @@ -1,5 +1,11 @@ 2011-10-24 Juri Linkov + * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to + `search-whitespace-regexp' only when `isearch-regexp' is non-nil. + (Bug#9364) + +2011-10-24 Juri Linkov + * info.el (Info-following-node-name-re): Add newline to the list of allowed characters for leading space. (Bug#9824) === modified file 'lisp/isearch.el' --- lisp/isearch.el 2011-10-11 15:00:42 +0000 +++ lisp/isearch.el 2011-10-24 05:56:04 +0000 @@ -1452,7 +1452,7 @@ ;; Set `search-upper-case' to nil to not call ;; `isearch-no-upper-case-p' in `occur-1'. (search-upper-case nil) - (search-spaces-regexp search-whitespace-regexp)) + (search-spaces-regexp (if isearch-regexp search-whitespace-regexp))) (occur regexp nlines))) (declare-function hi-lock-read-face-name "hi-lock" ()) ------------------------------------------------------------ revno: 106175 fixes bug(s): http://debbugs.gnu.org/9824 committer: Juri Linkov branch nick: trunk timestamp: Mon 2011-10-24 08:47:05 +0300 message: * lisp/info.el (Info-following-node-name-re): Add newline to the list of allowed characters for leading space. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-24 02:56:59 +0000 +++ lisp/ChangeLog 2011-10-24 05:47:05 +0000 @@ -1,3 +1,8 @@ +2011-10-24 Juri Linkov + + * info.el (Info-following-node-name-re): Add newline to the list + of allowed characters for leading space. (Bug#9824) + 2011-10-24 Stefan Monnier * progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding. === modified file 'lisp/info.el' --- lisp/info.el 2011-09-22 16:15:52 +0000 +++ lisp/info.el 2011-10-24 05:47:05 +0000 @@ -2015,7 +2015,7 @@ Submatch 2 if non-nil is the parenthesized file name part of the node name. Submatch 3 is the local part of the node name. End of submatch 0, 1, and 3 are the same, so you can safely concat." - (concat "[ \t]*" ;Skip leading space. + (concat "[ \t\n]*" ;Skip leading space. "\\(\\(([^)]+)\\)?" ;Node name can start with a file name. "\\([" (or allowedchars "^,\t\n") "]*" ;Any number of allowed chars. "[" (or allowedchars "^,\t\n") " ]" ;The last char can't be a space. ------------------------------------------------------------ revno: 106174 committer: Stefan Monnier branch nick: trunk timestamp: Sun 2011-10-23 22:56:59 -0400 message: * lisp/progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding. * lisp/progmodes/octave-mod.el (octave-help): Remove. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-23 15:59:54 +0000 +++ lisp/ChangeLog 2011-10-24 02:56:59 +0000 @@ -1,3 +1,8 @@ +2011-10-24 Stefan Monnier + + * progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding. + * progmodes/octave-mod.el (octave-help): Remove. + 2011-10-23 Michael Albinus Sync with Tramp 2.2.3. @@ -16,16 +21,16 @@ for toggle-read-only. Note that this hasn't called vc-next-action since 2008-05-02, though it wasn't documented at the time. - * vc/ediff-init.el (ediff-toggle-read-only-function): Use - toggle-read-only. + * vc/ediff-init.el (ediff-toggle-read-only-function): + Use toggle-read-only. 2011-10-22 Alan Mackenzie Fix bug #9560, sporadic wrong indentation; improve instrumentation of c-parse-state. - * cc-engine.el (c-append-lower-brace-pair-to-state-cache): correct - faulty logical expression. + * cc-engine.el (c-append-lower-brace-pair-to-state-cache): + correct faulty logical expression. (c-parse-state-state, c-record-parse-state-state): (c-replay-parse-state-state): New defvar/defuns. (c-debug-parse-state): Use new functions. @@ -39,8 +44,8 @@ * progmodes/idlwave.el (idlwave-mode): * progmodes/vera-mode.el (vera-mode): No need to set - require-final-newline; that's done in prog-mode. Suggested by - Stefan Monnier. + require-final-newline; that's done in prog-mode. + Suggested by Stefan Monnier. 2011-10-21 Martin Rudalics @@ -61,8 +66,8 @@ 2011-10-21 Chong Yidong * progmodes/idlwave.el (idlwave-mode): - * progmodes/vera-mode.el (vera-mode): Use - mode-require-final-newline. + * progmodes/vera-mode.el (vera-mode): + Use mode-require-final-newline. 2011-10-20 Glenn Morris @@ -198,8 +203,8 @@ (global-whitespace-mode, global-whitespace-newline-mode): * xt-mouse.el (xterm-mouse-mode): Doc fix. - * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix - autogenerated docstring. + * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): + Fix autogenerated docstring. 2011-10-19 Juri Linkov === modified file 'lisp/progmodes/octave-inf.el' --- lisp/progmodes/octave-inf.el 2011-06-20 16:02:31 +0000 +++ lisp/progmodes/octave-inf.el 2011-10-24 02:56:59 +0000 @@ -68,7 +68,7 @@ (define-key map "\C-c\C-l" 'inferior-octave-dynamic-list-input-ring) (define-key map [menu-bar inout list-history] '("List Input History" . inferior-octave-dynamic-list-input-ring)) - (define-key map "\C-c\C-h" 'octave-help) + (define-key map "\C-c\C-h" 'info-lookup-symbol) map) "Keymap used in Inferior Octave mode.") === modified file 'lisp/progmodes/octave-mod.el' --- lisp/progmodes/octave-mod.el 2011-06-20 16:02:31 +0000 +++ lisp/progmodes/octave-mod.el 2011-10-24 02:56:59 +0000 @@ -655,14 +655,6 @@ (easy-menu-add octave-mode-menu) (octave-initialize-completions)) - -(defvar info-lookup-mode) - -(defun octave-help () - "Get help on Octave symbols from the Octave info files. -Look up symbol in the function, operator and variable indices of the info files." - (let ((info-lookup-mode 'octave-mode)) - (call-interactively 'info-lookup-symbol))) ;;; Miscellaneous useful functions ------------------------------------------------------------ revno: 106173 committer: Paul Eggert branch nick: trunk timestamp: Sun 2011-10-23 19:40:23 -0700 message: * configure.in (LIB_PTHREAD): Prepend -lpthread to LIBS (Bug#9852) if the library is found. Otherwise, later configure-time tests, such as the test for pthread_sigmask, generate the wrong results on some platforms. Problem reported for FreeBSD by Nali Toja. diff: === modified file 'ChangeLog' --- ChangeLog 2011-10-20 06:52:55 +0000 +++ ChangeLog 2011-10-24 02:40:23 +0000 @@ -1,3 +1,10 @@ +2011-10-24 Paul Eggert + + * configure.in (LIB_PTHREAD): Prepend -lpthread to LIBS (Bug#9852) + if the library is found. Otherwise, later configure-time tests, + such as the test for pthread_sigmask, generate the wrong results + on some platforms. Problem reported for FreeBSD by Nali Toja. + 2011-10-20 Paul Eggert Time zone name fixes for non-ASCII locales (Bug#641, Bug#9794) === modified file 'configure.in' --- configure.in 2011-10-20 06:52:55 +0000 +++ configure.in 2011-10-24 02:40:23 +0000 @@ -1723,7 +1723,8 @@ if test "$HAVE_PTHREAD" = yes; then case "${canonical}" in *-hpux*) ;; - *) LIB_PTHREAD="-lpthread" ;; + *) LIB_PTHREAD="-lpthread" + LIBS="$LIB_PTHREAD $LIBS" ;; esac AC_DEFINE(HAVE_PTHREAD, 1, [Define to 1 if you have pthread (-lpthread).]) fi ------------------------------------------------------------ revno: 106172 committer: Stefan Monnier branch nick: trunk timestamp: Sun 2011-10-23 22:03:24 -0400 message: * subr.el (apply-partially): Remove redundant comment. diff: === modified file 'lisp/subr.el' --- lisp/subr.el 2011-10-06 19:15:19 +0000 +++ lisp/subr.el 2011-10-24 02:03:24 +0000 @@ -116,8 +116,6 @@ ;; depend on backquote.el. (list 'function (cons 'lambda cdr))) -;; Partial application of functions (similar to "currying"). -;; This function is here rather than in subr.el because it uses CL. (defun apply-partially (fun &rest args) "Return a function that is a partial application of FUN to ARGS. ARGS is a list of the first N arguments to pass to FUN. ------------------------------------------------------------ revno: 106171 committer: Chong Yidong branch nick: trunk timestamp: Mon 2011-10-24 10:01:54 +0800 message: Document scroll-up-line and scroll-down-line in Emacs manual. * doc/emacs/display.texi (Scrolling): Document scroll-up-line and scroll-down-line. Document scroll-command property. (Recentering): New node, split off from Scrolling. Also, minor copyedits to standardize on the phrase "key binding" rather than "keybinding" in the manual. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-10-23 14:57:53 +0000 +++ doc/emacs/ChangeLog 2011-10-24 02:01:54 +0000 @@ -1,3 +1,9 @@ +2011-10-24 Chong Yidong + + * display.texi (Scrolling): Document scroll-up-line and + scroll-down-line. Document scroll-command property. + (Recentering): New node, split off from Scrolling. + 2011-10-23 Chong Yidong * frames.texi (Scroll Bars): GTK uses right scroll bars now. === modified file 'doc/emacs/display.texi' --- doc/emacs/display.texi 2011-10-21 14:45:34 +0000 +++ doc/emacs/display.texi 2011-10-24 02:01:54 +0000 @@ -13,6 +13,7 @@ @menu * Scrolling:: Commands to move text up and down in a window. +* Recentering:: A scroll command that centers the current line. * Auto Scrolling:: Redisplay scrolls text automatically when needed. * Horizontal Scrolling:: Moving text left and right in a window. * Narrowing:: Restricting display and editing to a portion @@ -48,15 +49,15 @@ Scrolling ``forward'' or ``up'' advances the portion of the buffer displayed in the window; equivalently, it moves the buffer text upwards relative to the window. Scrolling ``backward'' or ``down'' -moves the displayed portion backwards, and moves the text downwards -relative to the window. In Emacs, scrolling ``up'' or ``down'' refers -to the direction that the text moves in the window, @emph{not} the -direction that the window moves relative to the text; this terminology -was taken up by Emacs before the modern meaning of ``scrolling up'' -and ``scrolling down'' became widely adopted. Hence the strange -result that @key{PageDown} scrolls ``up'' in the Emacs sense. In this -manual, we refer to scrolling ``forward'' and ``backward'' where -possible, in order to minimize confusion. +displays an earlier portion of the buffer, and moves the text +downwards relative to the window. + + In Emacs, scrolling ``up'' or ``down'' refers to the direction that +the text moves in the window, @emph{not} the direction that the window +moves relative to the text. This terminology was adopted by Emacs +before the modern meaning of ``scrolling up'' and ``scrolling down'' +became widespread. Hence, the strange result that @key{PageDown} +scrolls ``up'' in the Emacs sense. The portion of a buffer displayed in a window always contains point. If you move point past the bottom or top of the window, scrolling @@ -64,11 +65,6 @@ Scrolling}). You can also scroll explicitly with these commands: @table @kbd -@item C-l -Scroll the selected window so that the current line is the center-most -text line; on subsequent consecutive invocations, make the current -line the top-most line, the bottom-most line, and so on in cyclic -order; also, maybe redisplay the screen (@code{recenter-top-bottom}). @item C-v @itemx @key{next} @itemx @key{PageDown} @@ -77,6 +73,86 @@ @itemx @key{prior} @itemx @key{PageUp} Scroll backward (@code{scroll-down-command}). +@end table + +@kindex C-v +@kindex M-v +@kindex next +@kindex prior +@kindex PageDown +@kindex PageUp +@findex scroll-up-command +@findex scroll-down-command + @kbd{C-v} (@code{scroll-up-command}) scrolls forward by nearly the +whole window height. The effect is to take the two lines at the +bottom of the window and put them at the top, followed by lines that +were not previously visible. If point was in the text that scrolled +off the top, it ends up on the window's new topmost line. The +@key{next} (or @key{PageDown}) key is equivalent to @kbd{C-v}. + + @kbd{M-v} (@code{scroll-down-command}) scrolls backward in a similar +way. The @key{prior} (or @key{PageUp}) key is equivalent to +@kbd{M-v}. + +@vindex next-screen-context-lines + The number of lines of overlap left by these scroll commands is +controlled by the variable @code{next-screen-context-lines}, whose +default value is 2. You can supply the commands with a numeric prefix +argument, @var{n}, to scroll by @var{n} lines; Emacs attempts to leave +point unchanged, so that the text and point move up or down together. +@kbd{C-v} with a negative argument is like @kbd{M-v} and vice versa. + +@vindex scroll-error-top-bottom + By default, these commands signal an error (by beeping or flashing +the screen) if no more scrolling is possible, because the window has +reached the beginning or end of the buffer. If you change the +variable @code{scroll-error-top-bottom} to @code{t}, the command moves +point to the farthest possible position. If point is already there, +the command signals an error. + +@vindex scroll-preserve-screen-position +@cindex @code{scroll-command} property + Some users like scroll commands to keep point at the same screen +position, so that scrolling back to the same screen conveniently +returns point to its original position. You can enable this behavior +via the variable @code{scroll-preserve-screen-position}. If the value +is @code{t}, Emacs adjusts point to keep the cursor at the same screen +position whenever a scroll command moves it off-window, rather than +moving it to the topmost or bottommost line. With any other +non-@code{nil} value, Emacs adjusts point this way even if the scroll +command leaves point in the window. This variable affects all the +scroll commands documented in this section, as well as scrolling with +the mouse wheel (@pxref{Wheeled Mice}); in general, it affects any +command that has a non-@code{nil} @code{scroll-command} property. +@xref{Property Lists,,, elisp, The Emacs Lisp Reference Manual}. + +@vindex scroll-up +@vindex scroll-down +@findex scroll-up-line +@findex scroll-down-line + The commands @kbd{M-x scroll-up} and @kbd{M-x scroll-down} behave +similarly to @code{scroll-up-command} and @code{scroll-down-command}, +except they do not obey @code{scroll-error-top-bottom}. Prior to +Emacs 24, these were the default commands for scrolling up and down. +The commands @kbd{M-x scroll-up-line} and @kbd{M-x scroll-down-line} +scroll the current window by one line at a time. If you intend to use +any of these commands, you might want to give them key bindings +(@pxref{Init Rebinding}). + +@node Recentering +@section Recentering + +@table @kbd +@item C-l +Scroll the selected window so the current line is the center-most text +line; on subsequent consecutive invocations, make the current line the +top line, the bottom line, and so on in cyclic order. Possibly +redisplay the screen too (@code{recenter-top-bottom}). + +@item M-x recenter +Scroll the selected window so the current line is the center-most text +line. Possibly redisplay the screen too. + @item C-M-l Scroll heuristically to bring useful information onto the screen (@code{reposition-window}). @@ -107,14 +183,13 @@ screen lines between point and the top or bottom of the window (@pxref{Auto Scrolling}). - You can also supply @kbd{C-l} with a prefix argument. With a plain -prefix argument, @kbd{C-u C-l}, Emacs simply recenters point. With a -positive argument @var{n}, it scrolls to place point @var{n} lines -down from the top of the window. An argument of zero puts point on -the topmost line. A negative argument @var{-n} puts point @var{n} -lines from the bottom of the window. When given an argument, -@kbd{C-l} does not clear the screen or cycle through different screen -positions. + You can also give @kbd{C-l} a prefix argument. A plain prefix +argument, @kbd{C-u C-l}, simply recenters point. A positive argument +@var{n} puts point @var{n} lines down from the top of the window. An +argument of zero puts point on the topmost line. A negative argument +@var{-n} puts point @var{n} lines from the bottom of the window. When +given an argument, @kbd{C-l} does not clear the screen or cycle +through different screen positions. @vindex recenter-redisplay If the variable @code{recenter-redisplay} has a non-@code{nil} @@ -127,62 +202,6 @@ The more primitive command @kbd{M-x recenter} behaves like @code{recenter-top-bottom}, but does not cycle among screen positions. -@kindex C-v -@kindex M-v -@kindex next -@kindex prior -@kindex PageDown -@kindex PageUp -@findex scroll-up-command -@findex scroll-down-command - @kbd{C-v} (@code{scroll-up-command}) scrolls forward by nearly the -whole window height. The effect is to take the two lines at the -bottom of the window and put them at the top, followed by lines that -were not previously visible. If point was in the text that scrolled -off the top, it ends up on the window's new topmost line. - - Similarly, @kbd{M-v} (@code{scroll-down-command}) scrolls backward. - - We refer to @kbd{C-v} and @kbd{M-v} as @dfn{full-screen scroll -commands}. The function key @key{next}, or @key{PageDown}, is -equivalent to @kbd{C-v}; the function key @key{prior}, or -@key{PageUp}, is equivalent to @kbd{M-v}. - -@vindex next-screen-context-lines - The variable @code{next-screen-context-lines} controls the number of -lines of overlap left by the full-screen scroll commands; by default, -it is 2. You can supply these commands with a numeric prefix argument -@var{n}. This scrolls the window by @var{n} lines, while attempting -to leave point unchanged (so that the text and point move up or down -together). @kbd{C-v} with a negative argument is like @kbd{M-v} and -vice versa. - -@vindex scroll-error-top-bottom - By default, the full-screen scroll commands signal an error (by -beeping or flashing the screen) if no more scrolling is possible, -because the window has reached the beginning or end of the buffer. If -you change the variable @code{scroll-error-top-bottom} to @code{t}, -Emacs instead moves point to the farthest possible position. If point -is already there, the command signals an error. - -@vindex scroll-preserve-screen-position - Some users like scroll commands to keep point at the same screen -position. Then, scrolling back to the same screen also conveniently -returns point to its original position. You can enable this via the -variable @code{scroll-preserve-screen-position}. If the value is -@code{t}, Emacs adjusts point to keep it at the same vertical position -within the window, rather than the window edge, whenever a scroll -command moves it off the window. With any other non-@code{nil} value, -Emacs adjusts point this way even if the scroll command leaves point -in the window. - -@vindex scroll-up -@vindex scroll-down - The commands @code{scroll-up} and @code{scroll-down} behave -similarly to @code{scroll-up-command} and @code{scroll-down-command}, -except they do not obey @code{scroll-error-top-bottom}. Prior to -Emacs 24, these were the default commands for scrolling up and down. - @kindex C-M-l @findex reposition-window @kbd{C-M-l} (@code{reposition-window}) scrolls the current window === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2011-10-22 01:17:33 +0000 +++ doc/emacs/emacs.texi 2011-10-24 02:01:54 +0000 @@ -342,6 +342,7 @@ Controlling the Display * Scrolling:: Commands to move text up and down in a window. +* Recentering:: A scrolling command that centers the current line. * Auto Scrolling:: Redisplay scrolls text automatically when needed. * Horizontal Scrolling:: Moving text left and right in a window. * Narrowing:: Restricting display and editing to a portion === modified file 'doc/emacs/kmacro.texi' --- doc/emacs/kmacro.texi 2011-07-11 15:41:41 +0000 +++ doc/emacs/kmacro.texi 2011-10-24 02:01:54 +0000 @@ -147,7 +147,7 @@ @findex kmacro-start-macro @findex kmacro-end-macro In addition to the @key{F3} and @key{F4} commands described above, -Emacs also supports an older set of keybindings for defining and +Emacs also supports an older set of key bindings for defining and executing keyboard macros. To begin a macro definition, type @kbd{C-x (} (@code{kmacro-start-macro}); as with @key{F3}, a prefix argument appends this definition to the last keyboard macro. To end a macro === modified file 'doc/emacs/macos.texi' --- doc/emacs/macos.texi 2011-10-18 01:42:28 +0000 +++ doc/emacs/macos.texi 2011-10-24 02:01:54 +0000 @@ -36,7 +36,7 @@ By default, the @key{alt} and @key{option} keys are the same as @key{Meta}. The Mac @key{Cmd} key is the same as @key{Super}, and -Emacs provides a set of keybindings using this modifier key that mimic +Emacs provides a set of key bindings using this modifier key that mimic other Mac / GNUstep applications (@pxref{Mac / GNUstep Events}). You can change these bindings in the usual way (@pxref{Key Bindings}). === modified file 'doc/emacs/programs.texi' --- doc/emacs/programs.texi 2011-10-12 17:38:34 +0000 +++ doc/emacs/programs.texi 2011-10-24 02:01:54 +0000 @@ -1441,7 +1441,7 @@ @kindex C-c , @key{SPC} Display a list of possible completions for the symbol at point (@code{semantic-complete-analyze-inline}). This also activates a set -of special keybindings for choosing a completion: @key{RET} accepts +of special key bindings for choosing a completion: @key{RET} accepts the current completion, @kbd{M-n} and @kbd{M-p} cycle through possible completions, @key{TAB} completes as far as possible and then cycles, and @kbd{C-g} or any other key aborts completion. === modified file 'doc/emacs/rmail.texi' --- doc/emacs/rmail.texi 2011-10-20 00:41:15 +0000 +++ doc/emacs/rmail.texi 2011-10-24 02:01:54 +0000 @@ -1242,11 +1242,12 @@ @node Rmail Editing @section Editing Within a Message - Most of the usual Emacs keybindings are available in Rmail mode, though a -few, such as @kbd{C-M-n} and @kbd{C-M-h}, are redefined by Rmail for -other purposes. However, the Rmail buffer is normally read only, and -most of the letters are redefined as Rmail commands. If you want to -edit the text of a message, you must use the Rmail command @kbd{e}. + Most of the usual Emacs key bindings are available in Rmail mode, +though a few, such as @kbd{C-M-n} and @kbd{C-M-h}, are redefined by +Rmail for other purposes. However, the Rmail buffer is normally read +only, and most of the letters are redefined as Rmail commands. If you +want to edit the text of a message, you must use the Rmail command +@kbd{e}. @table @kbd @item e === modified file 'doc/emacs/search.texi' --- doc/emacs/search.texi 2011-10-21 14:45:34 +0000 +++ doc/emacs/search.texi 2011-10-24 02:01:54 +0000 @@ -268,8 +268,8 @@ @vindex isearch-mode-map When incremental search is active, you can type @kbd{C-h C-h} to -access interactive help options, including a list of special -keybindings. These keybindings are part of the keymap +access interactive help options, including a list of special key +bindings. These key bindings are part of the keymap @code{isearch-mode-map} (@pxref{Keymaps}). @node Isearch Yank === modified file 'etc/NEWS' --- etc/NEWS 2011-10-23 14:57:53 +0000 +++ etc/NEWS 2011-10-24 02:01:54 +0000 @@ -293,7 +293,7 @@ when `scroll-error-top-bottom' is non-nil. +++ *** New variable `scroll-error-top-bottom' (see above). - ++++ *** New scrolling commands `scroll-up-line' and `scroll-down-line' scroll a line instead of full screen. +++ ------------------------------------------------------------ revno: 106170 committer: Michael Albinus branch nick: trunk timestamp: Sun 2011-10-23 18:08:19 +0200 message: Sync with Tramp 2.2.3. * trampver.texi: Update release number. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-10-14 07:16:56 +0000 +++ doc/misc/ChangeLog 2011-10-23 16:08:19 +0000 @@ -1,3 +1,9 @@ +2011-10-23 Michael Albinus + + Sync with Tramp 2.2.3. + + * trampver.texi: Update release number. + 2011-10-14 Glenn Morris * ert.texi (Introduction, How to Run Tests) === modified file 'doc/misc/trampver.texi' --- doc/misc/trampver.texi 2011-08-04 00:58:07 +0000 +++ doc/misc/trampver.texi 2011-10-23 16:08:19 +0000 @@ -8,7 +8,7 @@ @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.2.3-pre +@set trampver 2.2.3-24.1 @c Other flags from configuration @set instprefix /usr/local ------------------------------------------------------------ revno: 106169 committer: Michael Albinus branch nick: trunk timestamp: Sun 2011-10-23 17:59:54 +0200 message: Sync with Tramp 2.2.3. * net/tramp-cache.el (top): Pacify byte-compiler using `init-file-user' and `site-run-file'. * net/trampver.el: Update release number. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-23 03:38:23 +0000 +++ lisp/ChangeLog 2011-10-23 15:59:54 +0000 @@ -1,3 +1,12 @@ +2011-10-23 Michael Albinus + + Sync with Tramp 2.2.3. + + * net/tramp-cache.el (top): Pacify byte-compiler using + `init-file-user' and `site-run-file'. + + * net/trampver.el: Update release number. + 2011-10-23 Chong Yidong * files.el (toggle-read-only): Remove obsolete comment about === modified file 'lisp/net/tramp-cache.el' --- lisp/net/tramp-cache.el 2011-06-21 19:51:26 +0000 +++ lisp/net/tramp-cache.el 2011-10-23 15:59:54 +0000 @@ -383,7 +383,8 @@ ;; When "emacs -Q" has been called, both variables are nil. ;; We do not load the persistency file then, in order to ;; have a clean test environment. - (or init-file-user site-run-file)) + (or (and (boundp 'init-file-user) (symbol-value 'init-file-user)) + (and (boundp 'site-run-file) (symbol-value 'site-run-file)))) (condition-case err (with-temp-buffer (insert-file-contents tramp-persistency-file-name) === modified file 'lisp/net/trampver.el' --- lisp/net/trampver.el 2011-08-04 00:58:07 +0000 +++ lisp/net/trampver.el 2011-10-23 15:59:54 +0000 @@ -31,7 +31,7 @@ ;; should be changed only there. ;;;###tramp-autoload -(defconst tramp-version "2.2.3-pre" +(defconst tramp-version "2.2.3-24.1" "This version of Tramp.") ;;;###tramp-autoload @@ -44,7 +44,7 @@ (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" - (format "Tramp 2.2.3-pre is not fit for %s" + (format "Tramp 2.2.3-24.1 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) ------------------------------------------------------------ revno: 106168 committer: Chong Yidong branch nick: trunk timestamp: Sun 2011-10-23 22:57:53 +0800 message: Document scroll bar changes in Emacs manual. * doc/emacs/buffers.texi (Misc Buffer): Don't mention vc-toggle-read-only. * doc/emacs/frames.texi (Scroll Bars): GTK uses right scroll bars now. (Tool Bars): Copyedits. diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2011-10-21 14:45:34 +0000 +++ admin/FOR-RELEASE 2011-10-23 14:57:53 +0000 @@ -153,7 +153,7 @@ anti.texi arevert-xtra.texi cyd basic.texi cyd -buffers.texi +buffers.texi cyd building.texi calendar.texi cal-xtra.texi === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-10-23 03:38:23 +0000 +++ doc/emacs/ChangeLog 2011-10-23 14:57:53 +0000 @@ -1,5 +1,8 @@ 2011-10-23 Chong Yidong + * frames.texi (Scroll Bars): GTK uses right scroll bars now. + (Tool Bars): Copyedits. + * buffers.texi (Misc Buffer): Don't mention vc-toggle-read-only. 2011-10-22 Chong Yidong === modified file 'doc/emacs/buffers.texi' --- doc/emacs/buffers.texi 2011-10-23 03:38:23 +0000 +++ doc/emacs/buffers.texi 2011-10-23 14:57:53 +0000 @@ -229,9 +229,8 @@ whose access control says you cannot write it. @findex toggle-read-only - If you wish to make changes in a read-only buffer, use the command -@kbd{C-x C-q} (@code{toggle-read-only}). It makes a read-only buffer -writable, and makes a writable buffer read-only. This works by + The command @kbd{C-x C-q} (@code{toggle-read-only}) makes a read-only +buffer writable, and makes a writable buffer read-only. This works by setting the variable @code{buffer-read-only}, which has a local value in each buffer and makes the buffer read-only if its value is non-@code{nil}. === modified file 'doc/emacs/frames.texi' --- doc/emacs/frames.texi 2011-10-18 01:42:28 +0000 +++ doc/emacs/frames.texi 2011-10-23 14:57:53 +0000 @@ -956,55 +956,43 @@ @cindex Scroll Bar mode @cindex mode, Scroll Bar - On graphical displays, Emacs normally makes a @dfn{scroll bar} at -the left of each Emacs window, running the height of the -window.@footnote{Placing it at the left is usually more useful with -overlapping frames with text starting at the left margin.} - - When Emacs is compiled with GTK+ support on the X Window System, or -in operating systems such as Microsoft Windows or Mac OS, you can use -the scroll bar as you do in other graphical applications. If you -click @kbd{Mouse-1} on the scroll bar's up and down buttons, that -scrolls the window by one line at a time. Clicking @kbd{Mouse-1} -above or below the scroll bar's inner box scrolls the window by nearly -the entire height of the window, like @kbd{M-v} and @kbd{C-v} -respectively (@pxref{Moving Point}). Dragging the inner box with -@kbd{Mouse-1} scrolls the window continuously. - - If Emacs is compiled without GTK+ support on the X Window System, -the scroll bar behaves differently. The scroll bar's inner box is -drawn to represent the portion of the buffer currently displayed, with -the entire height of the scroll bar representing the entire length of -the buffer. @kbd{Mouse-1} anywhere on the scroll bar scrolls forward -like @kbd{C-v}, and @kbd{Mouse-3} scrolls backward like @kbd{M-v}. -Clicking @kbd{Mouse-2} in the scroll bar lets you move or drag the -inner box up and down. - - You can also click @kbd{C-Mouse-2} in the scroll bar to split a -window vertically. The split occurs on the line where you click. + On graphical displays, there is a @dfn{scroll bar} on the side of +each Emacs window. Clicking @kbd{Mouse-1} on the scroll bar's up and +down buttons scrolls the window by one line at a time. Clicking +@kbd{Mouse-1} above or below the scroll bar's inner box scrolls the +window by nearly the entire height of the window, like @kbd{M-v} and +@kbd{C-v} respectively (@pxref{Moving Point}). Dragging the inner box +scrolls continuously. + + If Emacs is compiled on the X Window System without X toolkit +support, the scroll bar behaves differently. Clicking @kbd{Mouse-1} +anywhere on the scroll bar scrolls forward like @kbd{C-v}, while +@kbd{Mouse-3} scrolls backward like @kbd{M-v}. Clicking @kbd{Mouse-2} +in the scroll bar lets you drag the inner box up and down. @findex scroll-bar-mode -@vindex scroll-bar-mode - You can toggle the use of the scroll bar with the command @kbd{M-x -scroll-bar-mode}. With a prefix argument, this command turns use of -scroll bars on if and only if the argument is positive. This command -applies to all frames, including frames yet to be created. Customize -the variable @code{scroll-bar-mode} to control the use of scroll bars -at startup. You can use it to specify that they are placed at the -right of windows if you prefer that. You have to set this variable -through the @samp{Customize} interface (@pxref{Easy Customization}), -or it will not work properly. You can also use the X resource -@samp{verticalScrollBars} to control the initial setting of Scroll Bar -mode. @xref{Resources}. - @findex toggle-scroll-bar - To enable or disable scroll bars for just the selected frame, use the + To toggle the use of scroll bars, type @kbd{M-x scroll-bar-mode}. +This command applies to all frames, including frames yet to be +created. To toggle scroll bars for just the selected frame, use the command @kbd{M-x toggle-scroll-bar}. +@vindex scroll-bar-mode + To control the use of scroll bars at startup, customize the variable +@code{scroll-bar-mode}. Its value should be either @code{right} (put +scroll bars on the right side of windows), @code{left} (put them on +the left), or @code{nil} (disable scroll bars). By default, Emacs +puts scroll bars on the right if it was compiled with GTK+ support on +the X Window System, and on MS-Windows or Mac OS; Emacs puts scroll +bars on the left if compiled on the X Window system without GTK+ +support (following the old convention for X applications). + @vindex scroll-bar-width @cindex width of the scroll bar - You can control the scroll bar width by changing the value of the -@code{scroll-bar-width} frame parameter. + You can also use the X resource @samp{verticalScrollBars} to enable +or disable the scroll bars (@pxref{Resources}). To control the scroll +bar width, change the @code{scroll-bar-width} frame parameter +(@pxref{Frame Parameters,,, elisp, The Emacs Lisp Reference Manual}). @node Wheeled Mice @section Scrolling With ``Wheeled'' Mice @@ -1082,36 +1070,33 @@ @cindex mode, Tool Bar @cindex icons, toolbar - The @dfn{tool bar} is a line (or lines) of icons at the top of the -Emacs window, just below the menu bar. You can click on these icons -with the mouse to do various jobs. - - The global tool bar contains general commands. Some major modes -define their own tool bars to replace it. A few ``special'' modes -that are not designed for ordinary editing remove some items from the -global tool bar. - - Tool bars work only on a graphical display. The tool bar uses colored -XPM icons if Emacs was built with XPM support. Otherwise, the tool -bar uses monochrome icons (PBM or XBM format). + On graphical displays, Emacs puts a @dfn{tool bar} at the top of +each frame, just below the menu bar. This is a row of icons which you +can click on with the mouse to invoke various commands. + + The global (default) tool bar contains general commands. Some major +modes define their own tool bars; whenever a buffer with such a major +mode is current, the mode's tool bar replaces the global tool bar. @findex tool-bar-mode @vindex tool-bar-mode - You can turn display of tool bars on or off with @kbd{M-x -tool-bar-mode} or by customizing the option @code{tool-bar-mode}. + To toggle the use of tool bars, type @kbd{M-x tool-bar-mode}. This +command applies to all frames, including frames yet to be created. To +control the use of tool bars at startup, customize the variable +@code{tool-bar-mode}. @vindex tool-bar-style @cindex Tool Bar style - When Emacs is compiled with GTK+ support, tool bars can have text and images. -Customize @code{tool-bar-style} to select style. The default style is -the same as for the desktop in the Gnome case. If no default is found, -the tool bar uses just images. + When Emacs is compiled with GTK+ support, each tool bar item can +consist of an image, or a text label, or both. By default, Emacs +follows the Gnome desktop's tool bar style setting; if none is +defined, it displays tool bar items as just images. To impose a +specific tool bar style, customize the variable @code{tool-bar-style}. @cindex Tool Bar position - You can also control the placement of the tool bar for the GTK+ tool bar -with the frame parameter @code{tool-bar-position}. -For a detailed description of frame parameters and customization, -see @ref{Frame Parameters,,, elisp, The Emacs Lisp Reference Manual}. + You can also control the placement of the tool bar for the GTK+ tool +bar with the frame parameter @code{tool-bar-position}. @xref{Frame +Parameters,,, elisp, The Emacs Lisp Reference Manual}. @node Dialog Boxes @section Using Dialog Boxes @@ -1186,11 +1171,11 @@ customizing the windows that display tooltips. @vindex x-gtk-use-system-tooltips - If Emacs is built with GTK support, it displays tooltips via GTK, -using the default appearance of GTK tooltips. To disable this, change -the variable @code{x-gtk-use-system-tooltips} to @code{nil}. If you -do this, or if Emacs is built without GTK support, the @code{tooltip} -face specifies most attributes of the tooltip text. + If Emacs is built with GTK+ support, it displays tooltips via GTK+, +using the default appearance of GTK+ tooltips. To disable this, +change the variable @code{x-gtk-use-system-tooltips} to @code{nil}. +If you do this, or if Emacs is built without GTK+ support, the +@code{tooltip} face specifies most attributes of the tooltip text. @node Mouse Avoidance @section Mouse Avoidance === modified file 'etc/NEWS' --- etc/NEWS 2011-10-23 03:38:23 +0000 +++ etc/NEWS 2011-10-23 14:57:53 +0000 @@ -230,14 +230,14 @@ (U+2010 and U+2011). ** Improved GTK integration - ++++ *** GTK scroll-bars are now placed on the right by default. Use `set-scroll-bar-mode' to change this. - ++++ *** GTK tool bars can have just text, just images or images and text. Customize `tool-bar-style' to choose style. On a Gnome desktop, the default is taken from the desktop settings. - +--- *** GTK tool bars can be placed on the left/right or top/bottom of the frame. The frame-parameter tool-bar-position controls this. It takes the values top, left, right or bottom. The Options => Show/Hide menu has entries @@ -276,10 +276,6 @@ *** Tramp offers handlers for file-selinux-context and set-file-selinux-context for remote machines which support SELinux. -+++ -** The function format-time-string now supports the %N directive, for -higher-resolution time stamps. - ** Changes for exiting Emacs +++ *** The function kill-emacs is now run upon receipt of the signals @@ -295,24 +291,20 @@ (bound to C-v/[next] and M-v/[prior]) do not signal errors at top/bottom of buffer at first key-press (instead move to top/bottom of buffer) when `scroll-error-top-bottom' is non-nil. - +++ *** New variable `scroll-error-top-bottom' (see above). *** New scrolling commands `scroll-up-line' and `scroll-down-line' scroll a line instead of full screen. - +++ *** New property `scroll-command' should be set on a command's symbol to define it as a scroll command affected by `scroll-preserve-screen-position'. - +++ *** If you customize `scroll-conservatively' to a value greater than 100, Emacs will never recenter point in the window when it scrolls due to cursor motion commands or commands that move point (e.f., `M-g M-g'). Previously, you needed to use `most-positive-fixnum' as the value of `scroll-conservatively' to achieve the same effect. - --- *** ``Aggressive'' scrolling now honors the scroll margins. If you customize `scroll-up-aggressively' or @@ -374,7 +366,6 @@ adding "(diff-mode . ((mode . whitespace)))" to .dir-locals.el will turn on `whitespace-mode' for *vc-diff* buffers. Modes should call `hack-dir-local-variables-non-file-buffer' to support this. - +++ *** Using "mode: MINOR-MODE" to enable a minor mode is deprecated. Instead, use "eval: (minor-mode 1)". @@ -1192,6 +1183,10 @@ to the error handler as if the debugger had not been invoked instead of jumping all the way to the top-level. ++++ +** The function format-time-string now supports the %N directive, for +higher-resolution time stamps. + ** New function `read-char-choice' reads a restricted set of characters, discarding any inputs not inside the set. ------------------------------------------------------------ revno: 106167 committer: Chong Yidong branch nick: trunk timestamp: Sun 2011-10-23 11:38:23 +0800 message: Make vc-toggle-read-only an alias for toggle-read-only. It hasn't worked in a VC sense since revision 87208, though this was not documented at the time (grr). * lisp/vc/vc-hooks.el (vc-toggle-read-only): Make it an obsolete alias for toggle-read-only. Note that this hasn't called vc-next-action since 2008-05-02, though it wasn't documented at the time. * lisp/files.el (toggle-read-only): Remove obsolete comment about version control. * doc/emacs/buffers.texi (Misc Buffer): Don't mention vc-toggle-read-only. * lisp/cedet/ede.el (ede-maybe-checkout): Function deleted; vc-toggle-read-only does not do version control now. * lisp/cedet/ede/project-am.el (project-remove-file, project-add-file) (project-new-target): Don't call ede-maybe-checkout. * lisp/cedet/ede/util.el (ede-make-buffer-writable): Don't use vc-toggle-read-only. * lisp/vc/ediff-init.el (ediff-toggle-read-only-function): Use toggle-read-only. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-10-22 10:57:50 +0000 +++ doc/emacs/ChangeLog 2011-10-23 03:38:23 +0000 @@ -1,3 +1,7 @@ +2011-10-23 Chong Yidong + + * buffers.texi (Misc Buffer): Don't mention vc-toggle-read-only. + 2011-10-22 Chong Yidong * windows.texi (Displaying Buffers): Fix broken lispref link. === modified file 'doc/emacs/buffers.texi' --- doc/emacs/buffers.texi 2011-10-22 01:17:33 +0000 +++ doc/emacs/buffers.texi 2011-10-23 03:38:23 +0000 @@ -231,13 +231,10 @@ @findex toggle-read-only If you wish to make changes in a read-only buffer, use the command @kbd{C-x C-q} (@code{toggle-read-only}). It makes a read-only buffer -writable, and makes a writable buffer read-only. This -works by setting the variable @code{buffer-read-only}, which has a local -value in each buffer and makes the buffer read-only if its value is -non-@code{nil}. If you have files under version control, you may find -it convenient to bind @kbd{C-x C-q} to @code{vc-toggle-read-only} -instead. This will guard you against an operation that will confuse -most modern version-control systems. @xref{Version Control}. +writable, and makes a writable buffer read-only. This works by +setting the variable @code{buffer-read-only}, which has a local value +in each buffer and makes the buffer read-only if its value is +non-@code{nil}. @findex rename-buffer @kbd{M-x rename-buffer} changes the name of the current buffer. You === modified file 'etc/NEWS' --- etc/NEWS 2011-10-21 14:45:34 +0000 +++ etc/NEWS 2011-10-23 03:38:23 +0000 @@ -853,7 +853,12 @@ of a file similar to `vc-diff', but using ediff backend. +++ -*** The option vc-initial-comment was removed in Emacs 23.2, but +*** The option `vc-initial-comment' was removed in Emacs 23.2, but +this was not advertised at the time. + ++++ +*** `vc-toggle-read-only' is an obsolete alias for `toggle-read-only'. +Since Emacs 23, it has done the same thing as `toggle-read-only', but this was not advertised at the time. ** FIXME: xdg-open for browse-url and reportbug, 2010/08. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-22 17:06:13 +0000 +++ lisp/ChangeLog 2011-10-23 03:38:23 +0000 @@ -1,3 +1,15 @@ +2011-10-23 Chong Yidong + + * files.el (toggle-read-only): Remove obsolete comment about + version control. + + * vc/vc-hooks.el (vc-toggle-read-only): Make it an obsolete alias + for toggle-read-only. Note that this hasn't called vc-next-action + since 2008-05-02, though it wasn't documented at the time. + + * vc/ediff-init.el (ediff-toggle-read-only-function): Use + toggle-read-only. + 2011-10-22 Alan Mackenzie Fix bug #9560, sporadic wrong indentation; improve instrumentation === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2011-10-20 00:26:14 +0000 +++ lisp/cedet/ChangeLog 2011-10-23 03:38:23 +0000 @@ -1,3 +1,14 @@ +2011-10-23 Chong Yidong + + * ede.el (ede-maybe-checkout): Function deleted; + vc-toggle-read-only does not do version control now. + + * ede/util.el (ede-make-buffer-writable): Don't use + vc-toggle-read-only. + + * ede/project-am.el (project-remove-file, project-add-file) + (project-new-target): Don't call ede-maybe-checkout. + 2011-10-19 Chong Yidong * ede.el (ede-minor-mode,global-ede-mode): === modified file 'lisp/cedet/ede.el' --- lisp/cedet/ede.el 2011-10-20 00:26:14 +0000 +++ lisp/cedet/ede.el 2011-10-23 03:38:23 +0000 @@ -1179,16 +1179,6 @@ Return the first non-nil value returned by PROC." (eval (cons 'or (ede-map-targets this proc)))) -;;; VC Handling -;; -(defun ede-maybe-checkout (&optional buffer) - "Check BUFFER out of VC if necessary." - (save-excursion - (if buffer (set-buffer buffer)) - (if (and buffer-read-only vc-mode - (y-or-n-p "Checkout Makefile.am from VC? ")) - (vc-toggle-read-only)))) - ;;; Some language specific methods. ;; === modified file 'lisp/cedet/ede/project-am.el' --- lisp/cedet/ede/project-am.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/ede/project-am.el 2011-10-23 03:38:23 +0000 @@ -214,7 +214,6 @@ target (project-am-preferred-target-type (buffer-file-name))))) (ede-with-projectfile ot (makefile-move-to-macro (project-am-macro ot)) - (ede-maybe-checkout) (makefile-end-of-command) (insert " " ofn) (makefile-fill-paragraph nil) @@ -226,10 +225,6 @@ "Remove the current buffer from any project targets." (ede-with-projectfile ot (makefile-move-to-macro (project-am-macro ot)) - (if (and buffer-read-only vc-mode - (y-or-n-p "Checkout Makefile.am from VC? ")) - (vc-toggle-read-only t)) - (ede-maybe-checkout) (makefile-navigate-macro (concat " *" (regexp-quote (ede-name fnnd)))) (replace-match "" t t nil 0) (makefile-fill-paragraph nil) @@ -271,7 +266,6 @@ (if (not ot) (error "Error creating target object %S" ntype)) (ede-with-projectfile ot (goto-char (point-min)) - (ede-maybe-checkout) (makefile-next-dependency) (if (= (point) (point-min)) (goto-char (point-max)) === modified file 'lisp/cedet/ede/util.el' --- lisp/cedet/ede/util.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/ede/util.el 2011-10-23 03:38:23 +0000 @@ -87,12 +87,7 @@ If BUFFER isn't specified, use the current buffer." (save-excursion (if buffer (set-buffer buffer)) - (if buffer-read-only - (if (and vc-mode - (y-or-n-p (format "Check out %s? " (buffer-file-name)))) - (vc-toggle-read-only) - (if (not vc-mode) - (toggle-read-only -1)))))) + (toggle-read-only -1))) (provide 'ede/util) === modified file 'lisp/files.el' --- lisp/files.el 2011-10-12 18:32:35 +0000 +++ lisp/files.el 2011-10-23 03:38:23 +0000 @@ -4700,11 +4700,7 @@ (not (eq (get major-mode 'mode-class) 'special))) (view-mode-enter)) (t (setq buffer-read-only (not buffer-read-only)) - (force-mode-line-update))) - (if (memq (vc-backend buffer-file-name) '(RCS SCCS)) - (message "%s" (substitute-command-keys - (concat "File is under version-control; " - "use \\[vc-next-action] to check in/out")))))) + (force-mode-line-update))))) (defun insert-file (filename) "Insert contents of file FILENAME into buffer after point. === modified file 'lisp/vc/ediff-init.el' --- lisp/vc/ediff-init.el 2011-03-03 08:19:34 +0000 +++ lisp/vc/ediff-init.el 2011-10-23 03:38:23 +0000 @@ -1340,11 +1340,9 @@ ovr-list)))))))) -(defvar ediff-toggle-read-only-function nil - "*Specifies the function to be used to toggle read-only. -If nil, Ediff tries to deduce the function from the binding of C-x C-q. -Normally, this is the `toggle-read-only' function, but, if version -control is used, it could be `vc-toggle-read-only' or `rcs-toggle-read-only'.") +(defvar ediff-toggle-read-only-function 'toggle-read-only + "Function to be used to toggle read-only status of the buffer. +If nil, Ediff tries using the command bound to C-x C-q.") (defcustom ediff-make-buffers-readonly-at-startup nil "Make all variant buffers read-only when Ediff starts up. === modified file 'lisp/vc/vc-hooks.el' --- lisp/vc/vc-hooks.el 2011-01-26 08:36:39 +0000 +++ lisp/vc/vc-hooks.el 2011-10-23 03:38:23 +0000 @@ -648,22 +648,8 @@ (throw 'found trial)))) templates)))) -(defun vc-toggle-read-only (&optional verbose) - "Change read-only status of current buffer, perhaps via version control. - -If the buffer is visiting a file registered with version control, -throw an error, because this is not a safe or really meaningful operation -on any version-control system newer than RCS. - -Otherwise, just change the read-only flag of the buffer. - -If you bind this function to \\[toggle-read-only], then Emacs -will properly intercept all attempts to toggle the read-only flag -on version-controlled buffer." - (interactive "P") - (if (vc-backend buffer-file-name) - (error "Toggling the readability of a version controlled file is likely to wreak havoc") - (toggle-read-only))) +(define-obsolete-function-alias + 'vc-toggle-read-only 'toggle-read-only "24.1") (defun vc-default-make-version-backups-p (backend file) "Return non-nil if unmodified versions should be backed up locally.