Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99393. ------------------------------------------------------------ revno: 99393 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Wed 2010-01-27 14:29:18 +0900 message: Fix src/ChangeLog. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-27 05:23:52 +0000 +++ src/ChangeLog 2010-01-27 05:28:39 +0000 @@ -1,7 +1,7 @@ 2010-01-27 Kenichi Handa * regex.c (analyse_first): Fix setting of fastmap for unibyte - pattern string. + pattern string (Bug#4209). 2010-01-27 David De La Harpe Golden ------------------------------------------------------------ revno: 99392 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Wed 2010-01-27 14:25:10 +0900 message: regex.c (analyse_first): Fix setting of fastmap for unibyte pattern string. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-27 04:08:41 +0000 +++ src/ChangeLog 2010-01-27 05:23:52 +0000 @@ -1,3 +1,8 @@ +2010-01-27 Kenichi Handa + + * regex.c (analyse_first): Fix setting of fastmap for unibyte + pattern string. + 2010-01-27 David De La Harpe Golden * fileio.c (Frename_file): Call copy-directory and === modified file 'src/regex.c' --- src/regex.c 2010-01-13 08:35:10 +0000 +++ src/regex.c 2010-01-27 05:17:35 +0000 @@ -4083,8 +4083,7 @@ the corresponding multibyte character. */ int c = RE_CHAR_TO_MULTIBYTE (p[1]); - if (! CHAR_BYTE8_P (c)) - fastmap[CHAR_LEADING_CODE (c)] = 1; + fastmap[CHAR_LEADING_CODE (c)] = 1; } } break; ------------------------------------------------------------ revno: 99391 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-01-26 20:12:26 -0800 message: Add a quick-start guide. Add details of what happens when a bug is closed. diff: === modified file 'admin/notes/bugtracker' --- admin/notes/bugtracker 2010-01-24 20:28:50 +0000 +++ admin/notes/bugtracker 2010-01-27 04:12:26 +0000 @@ -2,6 +2,36 @@ The Emacs Bug Tracker can be found at http://debbugs.gnu.org/ +* Quick-start guide + +This is 95% of all you will ever need. + +** How do I report a bug? +Use M-x report-emacs-bug, or send mail to bug-gnu-emacs@gnu.org. +If you want to Cc someone, use an "X-Debbugs-CC" header instead. + +** How do I comment on a bug? +Reply to a mail on the bug-gnu-emacs list in the normal way. +Or send a mail to 123@debbugs.gnu.org. + +If the bug is old and closed, you may have to unarchive it first. +Send a mail to control@debbugs.gnu.org with +unarchive 123 +on the first line of the body. + +** How do I close a bug? +Send a mail to 123-done@debbugs.gnu.org. In the body, explain +why the bug is being closed. + +** How do I set bug meta-data? +By mailing commands to control@debbugs.gnu.org. Place commands at the +start of the message body, one per line. + +severity 123 serious|important|normal|minor|wishlist +tags 123 moreinfo|unreproducible|wontfix|patch + +* More detailed information + For a list of all bugs, see http://debbugs.gnu.org/db/pa/lemacs.html This is a static page, updated once a day. There is also a dynamic list, generated on request, but since there are many bug reports this @@ -110,11 +140,7 @@ ** Not interested in tracker control messages (tags being set, etc)? Discard mails matching: -^X-Emacs-PR-Message: transcript - -When you close a bug, you get a message matching: - -^X-Emacs-PR-Message: closed +^X-Emacs-PR-Message: (transcript|closed) ** How to avoid multiple copies of mails. If you reply to reports in the normal way, this should work fine. @@ -131,6 +157,31 @@ submitter; they get copies anyway so this will just result in more duplicate mail. +** Details of closing a bug. +(For information only) +Sending a mail to 123-done does the following: + +1) Mark the bug as closed in the database. + +2) Send a mail to the original submitter telling them that their bug +has been closed. This mail has a header: + +X-Emacs-PR-Message: they-closed 123 + +3) Send a mail to you and to the emacs-bug-tracker list confirming +that the bug has been closed. This mail has a header: + +X-Emacs-PR-Message: closed 123 + +4) Send a copy of your mail to the bug-gnu-emacs list in exactly the +same way as if you had sent mail to "123" (sans -done). This mail has +headers: + +X-Emacs-PR-Message: cc-closed 123 +Mail-Followup-To: 123@debbugs.gnu.org, ... + +(This is Emacs-specific. Normally the bug list gets the same mail as in 3). + ** Setting bug parameters. There are two ways to set the parameters of bugs in the database (tags, severity level, etc). When you report a new bug, you can ------------------------------------------------------------ revno: 99390 committer: Chong Yidong branch nick: trunk timestamp: Tue 2010-01-26 23:08:41 -0500 message: Fix rename-file to handle directory renaming properly (Bug#3353). * fileio.c (Frename_file): Call copy-directory and delete-directory for directories, in order to handle cross-device renaming. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-25 07:45:12 +0000 +++ src/ChangeLog 2010-01-27 04:08:41 +0000 @@ -1,3 +1,9 @@ +2010-01-27 David De La Harpe Golden + + * fileio.c (Frename_file): Call copy-directory and + delete-directory for directories, in order to handle cross-device + renaming (Bug#3353). + 2010-01-25 Jan Djärv * xfns.c (Fx_create_frame): If frame height is too big, try @@ -9323,7 +9329,7 @@ (syms_of_xterm): Don't declare it any more. (x_draw_glyph_string): Adjust to the new name. -2008-06-10 David De La Harpe Golden (tiny change) +2008-06-10 David De La Harpe Golden * xterm.c (x_underline_minimum_display_offset): New var. (x_draw_glyph_string): Use it. === modified file 'src/fileio.c' --- src/fileio.c 2010-01-13 04:33:42 +0000 +++ src/fileio.c 2010-01-27 04:08:41 +0000 @@ -215,6 +215,12 @@ /* Lisp function for moving files to trash. */ Lisp_Object Qmove_file_to_trash; +/* Lisp function for recursively copying directories. */ +Lisp_Object Qcopy_directory; + +/* Lisp function for recursively deleting directories. */ +Lisp_Object Qdelete_directory; + extern Lisp_Object Vuser_login_name; #ifdef WINDOWSNT @@ -2241,7 +2247,11 @@ && (NILP (Fstring_equal (Fdowncase (file), Fdowncase (newname)))) #endif ) - newname = Fexpand_file_name (Ffile_name_nondirectory (file), newname); + { + Lisp_Object fname = NILP (Ffile_directory_p (file)) + ? file : Fdirectory_file_name (file); + newname = Fexpand_file_name (Ffile_name_nondirectory (fname), newname); + } else newname = Fexpand_file_name (newname, Qnil); @@ -2279,15 +2289,21 @@ NILP (ok_if_already_exists) ? Qnil : Qt); else #endif + if (Ffile_directory_p (file)) + call4 (Qcopy_directory, file, newname, Qt, Qnil); + else + /* We have already prompted if it was an integer, so don't + have copy-file prompt again. */ Fcopy_file (file, newname, - /* We have already prompted if it was an integer, - so don't have copy-file prompt again. */ NILP (ok_if_already_exists) ? Qnil : Qt, Qt, Qt); count = SPECPDL_INDEX (); specbind (Qdelete_by_moving_to_trash, Qnil); - Fdelete_file (file); + if (Ffile_directory_p (file)) + call2 (Qdelete_directory, file, Qt); + else + Fdelete_file (file); unbind_to (count, Qnil); } else @@ -5727,6 +5743,10 @@ Qdelete_by_moving_to_trash = intern_c_string ("delete-by-moving-to-trash"); Qmove_file_to_trash = intern_c_string ("move-file-to-trash"); staticpro (&Qmove_file_to_trash); + Qcopy_directory = intern_c_string ("copy-directory"); + staticpro (&Qcopy_directory); + Qdelete_directory = intern_c_string ("delete-directory"); + staticpro (&Qdelete_directory); defsubr (&Sfind_file_name_handler); defsubr (&Sfile_name_directory); ------------------------------------------------------------ revno: 99389 author: Stephen Berman committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-01-26 20:00:54 -0800 message: Fix bug#5477. Stephen Berman : (diary-unhide-everything): Handle narrowed buffers. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-27 03:17:23 +0000 +++ lisp/ChangeLog 2010-01-27 04:00:54 +0000 @@ -1,3 +1,8 @@ +2010-01-27 Stephen Berman + + * calendar/diary-lib.el (diary-unhide-everything): Handle narrowed + buffers. (Bug#5477) + 2010-01-27 David De La Harpe Golden * files.el (delete-directory): Handle moving to trash without === modified file 'lisp/calendar/diary-lib.el' --- lisp/calendar/diary-lib.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/diary-lib.el 2010-01-27 04:00:54 +0000 @@ -804,7 +804,9 @@ (defun diary-unhide-everything () "Show all invisible text in the diary." (kill-local-variable 'diary-selective-display) - (remove-overlays (point-min) (point-max) 'invisible 'diary) + (save-restriction ; bug#5477 + (widen) + (remove-overlays (point-min) (point-max) 'invisible 'diary)) (kill-local-variable 'mode-line-format)) (defvar original-date) ; bound in diary-list-entries ------------------------------------------------------------ revno: 99388 committer: Chong Yidong branch nick: trunk timestamp: Tue 2010-01-26 22:36:36 -0500 message: * lisp/files.el (delete-directory): Fix typo in last change. diff: === modified file 'lisp/files.el' --- lisp/files.el 2010-01-27 03:17:23 +0000 +++ lisp/files.el 2010-01-27 03:36:36 +0000 @@ -4692,8 +4692,8 @@ (delete-file file))) ;; We do not want to delete "." and "..". (directory-files - directory 'full directory-files-no-dot-files-regexp)) - (delete-directory-internal directory)))))) + directory 'full directory-files-no-dot-files-regexp))) + (delete-directory-internal directory))))) (defun copy-directory (directory newname &optional keep-time parents) "Copy DIRECTORY to NEWNAME. Both args must be strings. ------------------------------------------------------------ revno: 99387 committer: Chong Yidong branch nick: trunk timestamp: Tue 2010-01-26 22:17:23 -0500 message: Fix delete-directory recursion behavior for trashing (Bug#5436). * files.el (delete-directory): Handle moving to trash without first doing recursion (Bug#5436). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-26 07:22:25 +0000 +++ lisp/ChangeLog 2010-01-27 03:17:23 +0000 @@ -1,3 +1,8 @@ +2010-01-27 David De La Harpe Golden + + * files.el (delete-directory): Handle moving to trash without + first doing recursion (Bug#5436). + 2010-01-26 Dan Nicolaescu * vc-hooks.el (vc-path): Mark as obsolete. === modified file 'lisp/files.el' --- lisp/files.el 2010-01-17 02:25:53 +0000 +++ lisp/files.el 2010-01-27 03:17:23 +0000 @@ -4665,21 +4665,35 @@ ;; delete-directory handler. (setq directory (directory-file-name (expand-file-name directory))) (let ((handler (find-file-name-handler directory 'delete-directory))) - (if handler - (funcall handler 'delete-directory directory recursive) + (cond + (handler + (funcall handler 'delete-directory directory recursive)) + (delete-by-moving-to-trash + ;; Only move non-empty dir to trash if recursive deletion was + ;; requested. This mimics the non-`delete-by-moving-to-trash' + ;; case, where the operation fails in delete-directory-internal. + ;; As `move-file-to-trash' trashes directories (empty or + ;; otherwise) as a unit, we do not need to recurse here. + (if (and (not recursive) + ;; Check if directory is empty apart from "." and "..". + (directory-files + directory 'full directory-files-no-dot-files-regexp)) + (error "Directory is not empty, not moving to trash") + (move-file-to-trash directory))) + ;; Otherwise, call outselves recursively if needed. + (t (if (and recursive (not (file-symlink-p directory))) - (mapc - (lambda (file) - ;; This test is equivalent to - ;; (and (file-directory-p fn) (not (file-symlink-p fn))) - ;; but more efficient - (if (eq t (car (file-attributes file))) - (delete-directory file recursive) - (delete-file file))) - ;; We do not want to delete "." and "..". - (directory-files - directory 'full directory-files-no-dot-files-regexp))) - (delete-directory-internal directory)))) + (mapc (lambda (file) + ;; This test is equivalent to + ;; (and (file-directory-p fn) (not (file-symlink-p fn))) + ;; but more efficient + (if (eq t (car (file-attributes file))) + (delete-directory file recursive) + (delete-file file))) + ;; We do not want to delete "." and "..". + (directory-files + directory 'full directory-files-no-dot-files-regexp)) + (delete-directory-internal directory)))))) (defun copy-directory (directory newname &optional keep-time parents) "Copy DIRECTORY to NEWNAME. Both args must be strings. ------------------------------------------------------------ revno: 99386 committer: Dan Nicolaescu branch nick: trunk timestamp: Mon 2010-01-25 23:22:25 -0800 message: (vc-path): Mark as obsolete. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-25 09:04:59 +0000 +++ lisp/ChangeLog 2010-01-26 07:22:25 +0000 @@ -1,3 +1,7 @@ +2010-01-26 Dan Nicolaescu + + * vc-hooks.el (vc-path): Mark as obsolete. + 2010-01-25 Dan Nicolaescu * vc-annotate.el (vc-annotate-revision-at-line): Compare file === modified file 'lisp/vc-hooks.el' --- lisp/vc-hooks.el 2010-01-13 08:35:10 +0000 +++ lisp/vc-hooks.el 2010-01-26 07:22:25 +0000 @@ -89,6 +89,8 @@ :type '(repeat directory) :group 'vc) +(make-obsolete 'vc-path "should not be necessary anymore." "23.2") + (defcustom vc-make-backup-files nil "If non-nil, backups of registered files are made as with other files. If nil (the default), files covered by version control don't get backups." ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.