# HG changeset patch # User Katsumi Yamaoka # Date 1271285073 0 # Node ID 18f276a67de9cb99d5f5f39cdc50e880e323dd29 # Parent eb72bd4ec8f0bd70a02b9f64744ef15f5840c0b2# Parent cf183258f1db7c2b226e2df6a503a1942a309e09 Merge from mainline. diff -r eb72bd4ec8f0 -r 18f276a67de9 admin/notes/bugtracker --- a/admin/notes/bugtracker Tue Apr 13 22:49:24 2010 +0000 +++ b/admin/notes/bugtracker Wed Apr 14 22:44:33 2010 +0000 @@ -4,7 +4,7 @@ * Quick-start guide -This is 95% of all you will ever need. +This is 95% of all you will ever need to know. ** How do I report a bug? Use M-x report-emacs-bug, or send mail to bug-gnu-emacs@gnu.org. @@ -34,8 +34,12 @@ 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 -is slow and not recommended. +list, generated on request. This accepts various options, eg to see +the most recent bugs: + +http://debbugs.gnu.org/cgi/pkgreport.cgi?newest=100 + +Or follow the links on the front page http://debbugs.gnu.org . ** How do I report a bug in Emacs now? The same way as you always did. Send mail to bug-gnu-emacs@gnu.org, @@ -92,6 +96,9 @@ in the subsequent discussion will end up creating a new bug. This is annoying. +(So annoying that a form of message-id tracking has been implemented +to hopefully stop this happening, but it is still better to use X-Debbugs-CC.) + If a new report contains X-Debbugs-CC in the input, this is converted to a real Cc header in the output. (See Bug#1720). It is also merged into the Resent-CC header (see below). @@ -191,8 +198,7 @@ Version: 23.0.60 Severity: minor -Optionally, add a sub-package, eg Package: emacs,calendar. -This can include tags. Some things (e.g. submitter) don't seem to +This can also include tags. Some things (e.g. submitter) don't seem to work here. Otherwise, send mail to the control server, control@debbugs.gnu.org. @@ -229,7 +235,7 @@ 123 # given bug number 123;mbox=yes # mbox version of given bug -package # bugs in given package (don't use "emacs" - too many bugs!) +package # bugs in given package from:submitter@email.address severity:severity # all bugs of given severity tag:tag # all bugs with given tag @@ -281,6 +287,9 @@ search box. The only piece you really need to add is the "users" portion, the rest has the same syntax as normal. +**** To browse bugs by usertag: +http://debbugs.gnu.org/cgi/pkgindex.cgi?indexon=users + **** To find all bugs usertagged by a given email address: http://debbugs.gnu.org/cgi/pkgreport.cgi?users=bug-gnu-emacs@gnu.org @@ -359,7 +368,7 @@ notfixed 123 23.0.60 *** To assign or reassign a bug to a package or list of packages: -reassign 1234 emacs,cc-mode +reassign 1234 emacs ** To remove spam from the tracker, move it to the `spam' pseudo-package: reassign 123 spam diff -r eb72bd4ec8f0 -r 18f276a67de9 lisp/ChangeLog --- a/lisp/ChangeLog Tue Apr 13 22:49:24 2010 +0000 +++ b/lisp/ChangeLog Wed Apr 14 22:44:33 2010 +0000 @@ -1,3 +1,12 @@ +2010-04-14 Óscar Fuentes + + * ido.el (ido-file-internal): Fix 2009-12-02 change. + +2010-04-14 Christoph (tiny change) + + * progmodes/grep.el (grep-compute-defaults): Fix handling of host + default settings (Bug#5928). + 2010-04-10 Glenn Morris * progmodes/fortran.el (fortran-match-and-skip-declaration): diff -r eb72bd4ec8f0 -r 18f276a67de9 lisp/ido.el --- a/lisp/ido.el Tue Apr 13 22:49:24 2010 +0000 +++ b/lisp/ido.el Wed Apr 14 22:44:33 2010 +0000 @@ -2272,7 +2272,8 @@ (or ido-use-url-at-point ido-use-filename-at-point)) (let (fn d) (require 'ffap) - ;; Duplicate code from ffap-guesser as we want different behavior for files and URLs. + ;; Duplicate code from ffap-guesser as we want different + ;; behavior for files and URLs. (cond ((with-no-warnings (and ido-use-url-at-point @@ -2288,7 +2289,10 @@ (ffap-guesser) (ffap-string-at-point)))) (not (string-match "^http:/" fn)) - (setq d (file-name-directory (expand-file-name fn))) + (let ((absolute-fn (expand-file-name fn))) + (setq d (if (file-directory-p absolute-fn) + (file-name-as-directory absolute-fn) + (file-name-directory absolute-fn)))) (file-directory-p d)) (setq ido-current-directory d) (setq initial (file-name-nondirectory fn)))))) diff -r eb72bd4ec8f0 -r 18f276a67de9 lisp/progmodes/grep.el --- a/lisp/progmodes/grep.el Tue Apr 13 22:49:24 2010 +0000 +++ b/lisp/progmodes/grep.el Wed Apr 14 22:44:33 2010 +0000 @@ -513,8 +513,8 @@ grep-find-template grep-find-use-xargs grep-highlight-matches)) (set setting - (or (cadr (assq setting host-defaults)) - (cadr (assq setting defaults))))) + (cadr (or (assq setting host-defaults) + (assq setting defaults))))) (unless (or (not grep-use-null-device) (eq grep-use-null-device t)) (setq grep-use-null-device