Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 102700. ------------------------------------------------------------ revno: 102700 committer: Chong Yidong branch nick: trunk timestamp: Tue 2010-12-21 15:54:27 +0800 message: Resection the Killing chapter in the Emacs manual. * killing.texi: Resection the Info version to conform to the printed manual, to avoid making sections on Accumulating Text, CUA and Rectangles into full chapters. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2010-12-13 17:18:55 +0000 +++ doc/emacs/ChangeLog 2010-12-21 07:54:27 +0000 @@ -1,3 +1,9 @@ +2010-12-21 Chong Yidong + + * killing.texi: Resection the Info version to conform to the + printed manual, to avoid making sections on Accumulating Text, CUA + and Rectangles into full chapters. + 2010-12-13 Eli Zaretskii * custom.texi (Init Syntax): Add index entries for "character syntax". === modified file 'doc/emacs/killing.texi' --- doc/emacs/killing.texi 2010-06-23 02:46:43 +0000 +++ doc/emacs/killing.texi 2010-12-21 07:54:27 +0000 @@ -4,13 +4,9 @@ @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. -@node Killing, Yanking, Mark, Top +@node Killing, Registers, Mark, Top @chapter Killing and Moving Text -@ifnottex -@raisesections -@end ifnottex - @dfn{Killing} means erasing text and copying it into the @dfn{kill ring}, from which you can bring it back into the buffer by @dfn{yanking} it. (Some applications use the terms ``cutting'' and @@ -19,9 +15,16 @@ there are commands for killing many different types of syntactic units. -@iftex +@menu +* Deletion and Killing:: Commands that remove text. +* Yanking:: Commands that insert text. +* Accumulating Text:: Other methods to add text to the buffer. +* Rectangles:: Operating on text in rectangular areas. +* CUA Bindings:: Using C-x/C-c/C-v to kill and yank. +@end menu + +@node Deletion and Killing @section Deletion and Killing -@end iftex @cindex killing text @cindex cutting text @@ -233,7 +236,7 @@ non-@code{nil} value, identical subsequent kills yield a single kill-ring entry, without duplication. -@node Yanking, Accumulating Text, Killing, Top +@node Yanking @section Yanking @cindex moving text @cindex copying text @@ -416,7 +419,7 @@ @code{kill-ring}; you can view the entire contents of the kill ring with the command @kbd{C-h v kill-ring}. -@node Accumulating Text, Rectangles, Yanking, Top +@node Accumulating Text @section Accumulating Text @findex append-to-buffer @findex prepend-to-buffer @@ -487,7 +490,7 @@ Another way to move text around is to store it in a register. @xref{Registers}. -@node Rectangles, CUA Bindings, Accumulating Text, Top +@node Rectangles @section Rectangles @cindex rectangle @cindex columns (and rectangles) @@ -613,7 +616,7 @@ @code{string-rectangle}, but inserts the string on each line, shifting the original text to the right. -@node CUA Bindings, Registers, Rectangles, Top +@node CUA Bindings @section CUA Bindings @findex cua-mode @vindex cua-mode @@ -665,10 +668,6 @@ insert a newline after the word in the target list by pressing @key{RET}. -@ifnottex -@lowersections -@end ifnottex - @ignore arch-tag: d8da8f96-0928-449a-816e-ff2d3497866c @end ignore === modified file 'doc/emacs/regs.texi' --- doc/emacs/regs.texi 2010-01-13 08:35:10 +0000 +++ doc/emacs/regs.texi 2010-12-21 07:54:27 +0000 @@ -2,7 +2,7 @@ @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, @c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. -@node Registers, Display, CUA Bindings, Top +@node Registers, Display, Killing, Top @chapter Registers @cindex registers ------------------------------------------------------------ revno: 102699 committer: Chong Yidong branch nick: trunk timestamp: Tue 2010-12-21 15:10:31 +0800 message: Fix 2010-04-19 merge error in doc/emacs/maintaining.texi (Bug#7674). diff: === modified file 'doc/emacs/maintaining.texi' --- doc/emacs/maintaining.texi 2010-11-27 20:04:57 +0000 +++ doc/emacs/maintaining.texi 2010-12-21 07:10:31 +0000 @@ -2288,10 +2288,6 @@ You can also use the collection of tag names to complete a symbol name in the buffer. @xref{Symbol Completion}. -@ifnottex -@include emerge-xtra.texi -@end ifnottex - @node EDE @section Emacs Development Environment @cindex EDE (Emacs Development Environment) @@ -2355,6 +2351,10 @@ (@code{ede-compile-project}). EDE uses the file types to guess how the target should be built. +@ifnottex +@include emerge-xtra.texi +@end ifnottex + @ignore arch-tag: b9d83dfb-82ea-4ff6-bab5-05a3617091fb @end ignore ------------------------------------------------------------ revno: 102698 committer: Chong Yidong branch nick: trunk timestamp: Tue 2010-12-21 14:45:11 +0800 message: * help-fns.el (find-lisp-object-file-name): Locate .emacs from .emacs.elc (Bug#7530). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-12-21 02:36:48 +0000 +++ lisp/ChangeLog 2010-12-21 06:45:11 +0000 @@ -1,5 +1,8 @@ 2010-12-21 Chong Yidong + * help-fns.el (find-lisp-object-file-name): Locate .emacs from + .emacs.elc (Bug#7530). + * wid-edit.el (widget-image-find): Remove bogus :ascent spec from image spec (Bug#7480). === modified file 'lisp/help-fns.el' --- lisp/help-fns.el 2010-10-23 02:46:06 +0000 +++ lisp/help-fns.el 2010-12-21 06:45:11 +0000 @@ -289,13 +289,19 @@ ((not (stringp file-name)) ;; If we don't have a file-name string by now, we lost. nil) + ;; Now, `file-name' should have become an absolute file name. + ;; For files loaded from ~/.emacs.elc, try ~/.emacs. + ((let (fn) + (and (string-equal file-name + (expand-file-name ".emacs.elc" "~")) + (file-readable-p (setq fn (expand-file-name ".emacs" "~"))) + fn))) + ;; When the Elisp source file can be found in the install + ;; directory, return the name of that file. ((let ((lib-name (if (string-match "[.]elc\\'" file-name) (substring-no-properties file-name 0 -1) file-name))) - ;; When the Elisp source file can be found in the install - ;; directory return the name of that file - `file-name' should - ;; have become an absolute file name ny now. (or (and (file-readable-p lib-name) lib-name) ;; The library might be compressed. (and (file-readable-p (concat lib-name ".gz")) lib-name)))) ------------------------------------------------------------ revno: 102697 committer: Chong Yidong branch nick: trunk timestamp: Tue 2010-12-21 10:36:48 +0800 message: Revert bogus 2010-10-24 change to widget-image-find. * lisp/wid-edit.el (widget-image-find): Remove bogus :ascent spec from image spec (Bug#7480). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-12-21 02:30:36 +0000 +++ lisp/ChangeLog 2010-12-21 02:36:48 +0000 @@ -1,3 +1,8 @@ +2010-12-21 Chong Yidong + + * wid-edit.el (widget-image-find): Remove bogus :ascent spec from + image spec (Bug#7480). + 2010-12-21 Daiki Ueno * obsolete/pgg-parse.el, obsolete/pgg-pgp5.el, obsolete/pgg-pgp.el, === modified file 'lisp/wid-edit.el' --- lisp/wid-edit.el 2010-11-18 03:54:14 +0000 +++ lisp/wid-edit.el 2010-12-21 02:36:48 +0000 @@ -637,8 +637,8 @@ specs) (dolist (elt widget-image-conversion) (dolist (ext (cdr elt)) - (push (list :type (car elt) :file (concat image ext) - :ascent 'center) specs))) + (push (list :type (car elt) :file (concat image ext)) + specs))) (find-image (nreverse specs)))) (t ;; Oh well. ------------------------------------------------------------ revno: 102696 committer: Daiki Ueno branch nick: trunk timestamp: Tue 2010-12-21 11:30:36 +0900 message: Mark PGG obsolete. * obsolete/pgg-parse.el, obsolete/pgg-pgp5.el, obsolete/pgg-pgp.el, * obsolete/pgg-gpg.el, obsolete/pgg-def.el, obsolete/pgg.el: Move from lisp/. * gnus/mml1991.el (pgg-sign-region, pgg-encrypt-region): * gnus/gnus-art.el (pgg-snarf-keys-region): Autoload since PGG is now obsolete in Emacs. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-12-20 20:11:01 +0000 +++ lisp/ChangeLog 2010-12-21 02:30:36 +0000 @@ -1,3 +1,9 @@ +2010-12-21 Daiki Ueno + + * obsolete/pgg-parse.el, obsolete/pgg-pgp5.el, obsolete/pgg-pgp.el, + * obsolete/pgg-gpg.el, obsolete/pgg-def.el, obsolete/pgg.el: Move + from lisp/. + 2010-12-20 Leo * dnd.el (dnd-get-local-file-name): Unhex of file name shall === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-12-20 22:12:30 +0000 +++ lisp/gnus/ChangeLog 2010-12-21 02:30:36 +0000 @@ -1,3 +1,9 @@ +2010-12-21 Daiki Ueno + + * mml1991.el (pgg-sign-region, pgg-encrypt-region): + * gnus-art.el (pgg-snarf-keys-region): Autoload since PGG is now + obsolete in Emacs. + 2010-12-17 Lars Magne Ingebrigtsen * gnus-group.el (gnus-group-delete-articles): New command. === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2010-11-26 02:31:57 +0000 +++ lisp/gnus/gnus-art.el 2010-12-21 02:30:36 +0000 @@ -8086,6 +8086,7 @@ (Info-index-next 1))) nil))) +(autoload 'pgg-snarf-keys-region "pgg") ;; Called after pgg-snarf-keys-region, which autoloads pgg.el. (declare-function pgg-display-output-buffer "pgg" (start end status)) === modified file 'lisp/gnus/mml1991.el' --- lisp/gnus/mml1991.el 2010-10-11 23:29:33 +0000 +++ lisp/gnus/mml1991.el 2010-12-21 02:30:36 +0000 @@ -168,6 +168,9 @@ ;; pgg wrapper +(autoload 'pgg-sign-region "pgg") +(autoload 'pgg-encrypt-region "pgg") + (defvar pgg-default-user-id) (defvar pgg-errors-buffer) (defvar pgg-output-buffer) === renamed file 'lisp/pgg-def.el' => 'lisp/obsolete/pgg-def.el' === renamed file 'lisp/pgg-gpg.el' => 'lisp/obsolete/pgg-gpg.el' === renamed file 'lisp/pgg-parse.el' => 'lisp/obsolete/pgg-parse.el' === renamed file 'lisp/pgg-pgp.el' => 'lisp/obsolete/pgg-pgp.el' === renamed file 'lisp/pgg-pgp5.el' => 'lisp/obsolete/pgg-pgp5.el' === renamed file 'lisp/pgg.el' => 'lisp/obsolete/pgg.el' --- lisp/pgg.el 2010-10-11 23:29:33 +0000 +++ lisp/obsolete/pgg.el 2010-12-21 02:30:36 +0000 @@ -23,11 +23,6 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see . -;;; Commentary: - -;; This file is on its way to obsolescence, waiting for allout.el to -;; switch to EPG. - ;;; Code: (require 'pgg-def) ------------------------------------------------------------ revno: 102695 author: Julien Danjou committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2010-12-20 22:12:30 +0000 message: Revert "gnus-util: rewrite gnus-rescale-image". diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-12-17 22:45:16 +0000 +++ lisp/gnus/ChangeLog 2010-12-20 22:12:30 +0000 @@ -14,11 +14,6 @@ * nnimap.el (nnimap-retrieve-headers): Remove CRLF from the headers. -2010-12-17 Julien Danjou - - * gnus-util.el (gnus-rescale-image): Allow to resize images even if - they are from file. Can also scale up. - 2010-12-17 Andrew Cohen * gnus-sum.el (gnus-summary-refer-thread): Simplify code. Restore === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2010-12-17 22:45:16 +0000 +++ lisp/gnus/gnus-util.el 2010-12-20 22:12:30 +0000 @@ -1983,16 +1983,21 @@ "Rescale IMAGE to SIZE if possible. SIZE is in format (WIDTH . HEIGHT). Return a new image. Sizes are in pixels." - (when (fboundp 'imagemagick-types) + (if (or (not (fboundp 'imagemagick-types)) + (not (get-buffer-window (current-buffer)))) + image (let ((new-width (car size)) (new-height (cdr size))) - (unless (= (cdr (image-size image t)) new-height) - (setcdr image (plist-put (cdr image) :type 'imagemagick)) - (setcdr image (plist-put (cdr image) :height new-height))) - (unless (= (car (image-size image t)) new-width) - (setcdr image (plist-put (cdr image) :type 'imagemagick)) - (setcdr image (plist-put (cdr image) :width new-width))))) - image) + (when (> (cdr (image-size image t)) new-height) + (setq image (or (create-image (plist-get (cdr image) :data) 'imagemagick t + :height new-height) + image))) + (when (> (car (image-size image t)) new-width) + (setq image (or + (create-image (plist-get (cdr image) :data) 'imagemagick t + :width new-width) + image))) + image))) (defun gnus-list-memq-of-list (elements list) "Return non-nil if any of the members of ELEMENTS are in LIST." ------------------------------------------------------------ revno: 102694 committer: Jan D. branch nick: trunk timestamp: Mon 2010-12-20 21:11:01 +0100 message: * dnd.el (dnd-get-local-file-name): Unhex of file name shall always be performed (Bug#7680). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-12-20 14:44:28 +0000 +++ lisp/ChangeLog 2010-12-20 20:11:01 +0000 @@ -1,3 +1,8 @@ +2010-12-20 Leo + + * dnd.el (dnd-get-local-file-name): Unhex of file name shall + always be performed (Bug#7680). + 2010-12-20 Chong Yidong * menu-bar.el (menu-bar-kill-ring-save): Make obsolete. === modified file 'lisp/dnd.el' --- lisp/dnd.el 2010-10-08 10:14:47 +0000 +++ lisp/dnd.el 2010-12-20 20:11:01 +0000 @@ -135,6 +135,16 @@ (string-equal system-name-no-dot hostname))) (concat "file://" (substring uri (+ 7 (length hostname))))))) +(defsubst dnd-unescape-uri (uri) + (replace-regexp-in-string + "%[A-Fa-f0-9][A-Fa-f0-9]" + (lambda (arg) + (let ((str (make-string 1 0))) + (aset str 0 (string-to-number (substring arg 1) 16)) + str)) + uri t t)) + +;; http://lists.gnu.org/archive/html/emacs-devel/2006-05/msg01060.html (defun dnd-get-local-file-name (uri &optional must-exist) "Return file name converted from file:/// or file: syntax. URI is the uri for the file. If MUST-EXIST is given and non-nil, @@ -144,21 +154,11 @@ (substring uri (1- (match-end 0)))) ((string-match "^file:" uri) ; Old KDE, Motif, Sun (substring uri (match-end 0)))))) - (when (and f must-exist) - (setq f (replace-regexp-in-string - "%[A-Fa-f0-9][A-Fa-f0-9]" - (lambda (arg) - (let ((str (make-string 1 0))) - (aset str 0 (string-to-number (substring arg 1) 16)) - str)) - f t t)) - (let* ((decoded-f (decode-coding-string - f - (or file-name-coding-system - default-file-name-coding-system)))) - (setq f (cond ((file-readable-p decoded-f) decoded-f) - ((file-readable-p f) f) - (t nil))))) + (and f (setq f (decode-coding-string (dnd-unescape-uri f) + (or file-name-coding-system + default-file-name-coding-system)))) + (when (and f must-exist (not (file-readable-p f))) + (setq f nil)) f)) (defun dnd-open-local-file (uri action) ------------------------------------------------------------ revno: 102693 committer: Chong Yidong branch nick: trunk timestamp: Mon 2010-12-20 22:44:28 +0800 message: Bind "Copy" menu item to kill-ring-save, obsoleting menu-bar-kill-ring-save. * menu-bar.el (menu-bar-kill-ring-save): Make obsolete. (menu-bar-edit-menu): Bind "Copy" to kill-ring-save. Don't use mouse-region-match. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-12-20 03:18:56 +0000 +++ lisp/ChangeLog 2010-12-20 14:44:28 +0000 @@ -1,9 +1,11 @@ 2010-12-20 Chong Yidong + * menu-bar.el (menu-bar-kill-ring-save): Make obsolete. + (menu-bar-edit-menu): Bind "Copy" to kill-ring-save. Don't use + mouse-region-match. + * color.el: Move from gnus/. -2010-12-20 Chong Yidong - * vc/diff.el (diff-better-file-name): Function deleted. abbreviating file names causes problems with shell-quote-argument. (diff-no-select): Just use expand-file-name. === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2010-12-17 04:04:06 +0000 +++ lisp/menu-bar.el 2010-12-20 14:44:28 +0000 @@ -479,8 +479,7 @@ (define-key menu-bar-edit-menu [clear] `(menu-item ,(purecopy "Clear") delete-region :enable (and mark-active - (not buffer-read-only) - (not (mouse-region-match))) + (not buffer-read-only)) :help ,(purecopy "Delete the text in region between mark and current position"))) (defvar yank-menu (cons (purecopy "Select Yank") nil)) @@ -510,7 +509,7 @@ ;; under X (for GNUstep). `(menu-item ,(purecopy "Copy") ,(if (featurep 'ns) 'ns-copy-including-secondary - 'menu-bar-kill-ring-save) + 'kill-ring-save) :enable mark-active :help ,(purecopy "Copy text in region between mark and current position") :keys ,(purecopy (if (featurep 'ns) @@ -534,11 +533,8 @@ (consp buffer-undo-list))) :help ,(purecopy "Undo last operation"))) -(defun menu-bar-kill-ring-save (beg end) - (interactive "r") - (if (mouse-region-match) - (message "Selecting a region with the mouse does `copy' automatically") - (kill-ring-save beg end))) +(define-obsolete-function-alias + 'menu-bar-kill-ring-save 'kill-ring-save "24.1") ;; These are alternative definitions for the cut, paste and copy ;; menu items. Use them if your system expects these to use the clipboard. ------------------------------------------------------------ revno: 102692 committer: Chong Yidong branch nick: trunk timestamp: Mon 2010-12-20 19:11:30 +0800 message: * src/frame.c (focus_follows_mouse): Default to 0 (Bug#7269). diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-12-20 00:17:26 +0000 +++ etc/NEWS 2010-12-20 11:11:30 +0000 @@ -222,6 +222,8 @@ ** The standalone programs lib-src/digest-doc and sorted-doc have been replaced with Lisp commands `doc-file-to-man' and `doc-file-to-info'. +** The variable `focus-follows-mouse' now always defaults to nil. + * Editing Changes in Emacs 24.1 === modified file 'src/ChangeLog' --- src/ChangeLog 2010-12-20 00:17:26 +0000 +++ src/ChangeLog 2010-12-20 11:11:30 +0000 @@ -1,5 +1,9 @@ 2010-12-20 Chong Yidong + * frame.c (focus_follows_mouse): Default to 0 (Bug#7269). + +2010-12-20 Chong Yidong + * keyboard.c (Vtool_bar_separator_image_expression): New variable. (parse_tool_bar_item): Use it to obtain image separators for displays not using native tool-bar separators. === modified file 'src/frame.c' --- src/frame.c 2010-12-03 10:07:40 +0000 +++ src/frame.c 2010-12-20 11:11:30 +0000 @@ -4602,15 +4602,7 @@ You should set this variable to tell Emacs how your window manager handles focus, since there is no way in general for Emacs to find out automatically. See also `mouse-autoselect-window'. */); -#ifdef HAVE_WINDOW_SYSTEM -#if defined(HAVE_NTGUI) || defined(HAVE_NS) - focus_follows_mouse = 0; -#else - focus_follows_mouse = 1; -#endif -#else - focus_follows_mouse = 0; -#endif + focus_follows_mouse = 0; staticpro (&Vframe_list); ------------------------------------------------------------ revno: 102691 committer: Chong Yidong branch nick: trunk timestamp: Mon 2010-12-20 11:18:56 +0800 message: Move color.el out of the gnus/ tree. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-12-20 00:20:25 +0000 +++ lisp/ChangeLog 2010-12-20 03:18:56 +0000 @@ -1,5 +1,9 @@ 2010-12-20 Chong Yidong + * color.el: Move from gnus/. + +2010-12-20 Chong Yidong + * vc/diff.el (diff-better-file-name): Function deleted. abbreviating file names causes problems with shell-quote-argument. (diff-no-select): Just use expand-file-name. === renamed file 'lisp/gnus/color.el' => 'lisp/color.el'