Now on revision 106708. ------------------------------------------------------------ revno: 106708 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-12-21 15:46:49 +0800 message: * vc-bzr.el (vc-bzr-rename-file): Don't pass ~ to Bzr in filename arg. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-20 07:45:20 +0000 +++ lisp/ChangeLog 2011-12-21 07:46:49 +0000 @@ -1,3 +1,8 @@ +2011-12-21 Chong Yidong + + * vc/vc-bzr.el (vc-bzr-rename-file): Don't pass ~ to Bzr in + filename argument. + 2011-12-20 Martin Rudalics * window.el (window-normalize-buffer-to-display): Remove. === modified file 'lisp/vc/vc-bzr.el' --- lisp/vc/vc-bzr.el 2011-11-24 08:21:03 +0000 +++ lisp/vc/vc-bzr.el 2011-12-21 07:46:49 +0000 @@ -764,7 +764,10 @@ (defun vc-bzr-rename-file (old new) "Rename file from OLD to NEW using `bzr mv'." - (vc-bzr-command "mv" nil 0 new old)) + (setq old (expand-file-name old)) + (setq new (expand-file-name new)) + (vc-bzr-command "mv" nil 0 new old) + (message "Renamed %s => %s" old new)) (defvar vc-bzr-annotation-table nil "Internal use.") ------------------------------------------------------------ revno: 106707 committer: Jan D. branch nick: trunk timestamp: Wed 2011-12-21 07:37:49 +0100 message: Attribute Aquamacs code to David Reitter. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-12-18 14:53:01 +0000 +++ src/ChangeLog 2011-12-21 06:37:49 +0000 @@ -1,16 +1,22 @@ 2011-12-18 Jan Djärv + * nsmenu.m (NSMenuDidBeginTrackingNotification): Declare if OSX < 10.5 + and NS_IMPL_COCOA. + (trackingNotification): Surround with ifdef NS_IMPL_COCOA. + (syms_of_nsmenu): Set trackingMenu to 1 if not NS_IMPL_COCOA. + +2011-12-18 David Reitter + * nsterm.m (ns_term_init): Subscribe for notifications NSMenuDidBeginTrackingNotification and NSMenuDidEndTrackingNotification to method trackingNotification in EmacsMenu. * nsmenu.m (trackingMenu): New variable. - (NSMenuDidBeginTrackingNotification): Declare if OSX < 10.5 and - NS_IMPL_COCOA. (trackingNotification): New method (from Aquamacs). (menuNeedsUpdate): Expand comment and return if trackingMenu is 0, from Aquamacs (Bug#7030). - (syms_of_nsmenu): Set trackingMenu to 1 if not NS_IMPL_COCOA. + +2011-12-18 Jan Djärv * nsselect.m (CUT_BUFFER_SUPPORT): Remove define. (symbol_to_nsstring): Fix indentation. ------------------------------------------------------------ revno: 106706 committer: Alan Mackenzie branch nick: trunk timestamp: Tue 2011-12-20 16:00:47 +0000 message: Update programs.texi and cc-mode.texi for new CC Mode features: cc-mode.texi: Update version string to 5.32. programs.texi: Describe "guessing" of indentation style. Update C-M-a/e. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-12-20 03:00:10 +0000 +++ doc/emacs/ChangeLog 2011-12-20 16:00:47 +0000 @@ -1,3 +1,9 @@ +2011-12-20 Alan Mackenzie + + * programs.texi (Motion in C): Update the description of C-M-a and + C-M-e, they now DTRT in enclosing scopes. + (Custom C Indent): Add @dfn{guessing} of the indentation style. + 2011-12-20 Chong Yidong * maintaining.texi (VCS Concepts): Add "working tree" terminology. === modified file 'doc/emacs/programs.texi' --- doc/emacs/programs.texi 2011-12-08 13:21:58 +0000 +++ doc/emacs/programs.texi 2011-12-20 16:00:47 +0000 @@ -38,8 +38,8 @@ * Glasses:: Making identifiersLikeThis more readable. * Semantic:: Suite of editing tools based on source code parsing. * Misc for Programs:: Other Emacs features useful for editing programs. -* C Modes:: Special commands of C, C++, Objective-C, - Java, and Pike modes. +* C Modes:: Special commands of C, C++, Objective-C, Java, + IDL, Pike and AWK modes. * Asm Mode:: Asm mode and its special features. @ifnottex * Fortran:: Fortran mode and its special features. @@ -606,6 +606,13 @@ including how to override parts of an existing style and how to define your own styles. + As an alternative to specifying a style, you can get Emacs to +@dfn{guess} the style by scanning a code buffer which is already +formatted. To do this, call @kbd{M-x c-guess} in your sample buffer. +You can then apply this guessed style to other buffers with @kbd{M-x +c-guess-install}. @xref{Guessing the Style,,, ccmode, the CC Mode +Manual}, for more details about this mechanism. + @node Parentheses @section Commands for Editing with Parentheses @@ -1462,17 +1469,17 @@ related modes. @table @code -@item M-x c-beginning-of-defun -@itemx M-x c-end-of-defun +@item C-M-a +@itemx C-M-e @findex c-beginning-of-defun @findex c-end-of-defun Move point to the beginning or end of the current function or -top-level definition. These are found by searching for the least +top-level definition. In languages with enclosing scopes (such as +C++'s classes) the @dfn{current function} is the immediate one, +possibly inside a scope. Otherwise it is the one defined by the least enclosing braces. (By contrast, @code{beginning-of-defun} and -@code{end-of-defun} search for braces in column zero.) If you are -editing code where the opening brace of a function isn't placed in -column zero, you may wish to bind @code{C-M-a} and @code{C-M-e} to -these commands. @xref{Moving by Defuns}. +@code{end-of-defun} search for braces in column zero.) @xref{Moving +by Defuns}. @item C-c C-u @kindex C-c C-u @r{(C mode)} === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-12-06 01:30:54 +0000 +++ doc/misc/ChangeLog 2011-12-20 16:00:47 +0000 @@ -1,3 +1,7 @@ +2011-12-20 Alan Mackenzie + + * cc-mode.texi: Update version string 5.31 -> 5.32. + 2011-12-06 Juanma Barranquero * gnus-faq.texi (FAQ 2-1, FAQ 3-8, FAQ 4-14, FAQ 9-1): Fix typos. === modified file 'doc/misc/cc-mode.texi' --- doc/misc/cc-mode.texi 2011-12-12 05:32:49 +0000 +++ doc/misc/cc-mode.texi 2011-12-20 16:00:47 +0000 @@ -190,7 +190,7 @@ @titlepage @sp 10 -@center @titlefont{CC Mode 5.31} +@center @titlefont{CC Mode 5.32} @sp 2 @center @subtitlefont{A GNU Emacs mode for editing C and C-like languages} @sp 2 @@ -378,7 +378,7 @@ This manual describes @ccmode{} @comment The following line must appear on its own, so that the -version 5.31. +version 5.32. @comment Release.py script can update the version number automatically @ccmode{} supports the editing of K&R and ANSI C, C++, Objective-C, ------------------------------------------------------------ revno: 106705 committer: martin rudalics branch nick: trunk timestamp: Tue 2011-12-20 08:45:20 +0100 message: Restore Emacs 23 handling of display-buffer's BUFFER-OR-NAME argument. * window.el (window-normalize-buffer-to-display): Remove. (display-buffer): Handle buffer-or-name argument as in Emacs 23. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-19 15:46:50 +0000 +++ lisp/ChangeLog 2011-12-20 07:45:20 +0000 @@ -1,3 +1,8 @@ +2011-12-20 Martin Rudalics + + * window.el (window-normalize-buffer-to-display): Remove. + (display-buffer): Handle buffer-or-name argument as in Emacs 23. + 2011-12-19 Chong Yidong * vc/vc-dir.el (vc-dir-parent-marked-p, vc-dir-children-marked-p): === modified file 'lisp/window.el' --- lisp/window.el 2011-12-17 06:51:13 +0000 +++ lisp/window.el 2011-12-20 07:45:20 +0000 @@ -4526,19 +4526,6 @@ The actual non-nil value of this variable will be copied to the `window-dedicated-p' flag.") -(defun window-normalize-buffer-to-display (buffer-or-name) - "Normalize BUFFER-OR-NAME argument for buffer display functions. -If BUFFER-OR-NAME is nil, return the current buffer. Else, if a -buffer specified by BUFFER-OR-NAME exists, return that buffer. -If no such buffer exists, create a buffer with the name -BUFFER-OR-NAME and return that buffer." - (if buffer-or-name - (or (get-buffer buffer-or-name) - (let ((buffer (get-buffer-create buffer-or-name))) - (set-buffer-major-mode buffer) - buffer)) - (current-buffer))) - (defconst display-buffer--action-function-custom-type '(choice :tag "Function" (const :tag "--" ignore) ; default for insertion @@ -4640,7 +4627,7 @@ "A `display-buffer' action for displaying in another frame.") (put 'display-buffer--other-frame-action 'risky-local-variable t) -(defun display-buffer (&optional buffer-or-name action frame) +(defun display-buffer (buffer-or-name &optional action frame) "Display BUFFER-OR-NAME in some window, without selecting it. BUFFER-OR-NAME must be a buffer or the name of an existing buffer. Return the window chosen for displaying BUFFER-OR-NAME, @@ -4688,7 +4675,9 @@ `display-buffer-reuse-window'." (interactive (list (read-buffer "Display buffer: " (other-buffer)) (if current-prefix-arg t))) - (let ((buffer (window-normalize-buffer-to-display buffer-or-name)) + (let ((buffer (if (bufferp buffer-or-name) + buffer-or-name + (get-buffer buffer-or-name))) ;; Handle the old form of the first argument. (inhibit-same-window (and action (not (listp action))))) (unless (listp action) (setq action nil))