From: Miles Bader Date: Mon, 15 Oct 2007 02:07:53 +0000 (+0000) Subject: Merge from emacs--rel--22 X-Git-Tag: emacs-pretest-23.0.90~10322 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/b2529d56b5126319a1659dc1530d6fc102cc21d6 Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 116-121) - Update from CVS Revision: emacs@sv.gnu.org/emacs--devo--0--patch-889 --- b2529d56b5126319a1659dc1530d6fc102cc21d6 diff --cc admin/FOR-RELEASE index 1d79682849,96129ec22d..8ad2fc3ae5 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@@ -36,59 -34,41 +36,52 @@@ to the hack introduced on 2005-07-01 t ** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem on Cygwin. (Did we decide that is unreproducible?) - ** set-frame-size for frame without minibuffer loses mode line - Probably a Windows only bug. Reported by Drew Adams on bug-gnu-emacs on - 2007-08-07. It seems that the bug manifests itself only if resizing the - frame makes the menu bar wrap before. On 2007-08-16 Glenn Morris - reported on emacs-devel that he was not able to reproduce the bug on a - GNU/Linux system. - * BUGS WAITING FOR MORE USER INPUT -** undefined reference getopt_long -Report by Daniel C. Bastos on bug-gnu-emacs -from 2007-08-27. Impossible to procede without more input from OP (as -of 20070912, emails are bouncing) or someone else who can reproduce this. -http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01497.html +** raman@users.sf.net, sep 7: Emacs 23.0.50: Segfaults in alloc.c (batch process) +http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00690.html + +* BUGS -** TAGS buffer generates spurious undo warnings -Waiting for recipe to produce these warnings. -http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00070.html +** Document the changes introduced by multi-tty +http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01639.html +http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01602.html -** emacs-22.1 with GTK problems (with patches) -Only outstanding issue seems to be whether Solaris 2.6 GTK can be -supported in the absence of recursive mutexes, via a change to -alloc.c, or whether configure should abort. -http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00055.html +** Does deleting frames run Lisp code? If so, can we get rid of that? +It is a dangerous design. +http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg01330.html -* BUGS +** Why were the calls to x_fully_uncatch_errors commented out in eval.c? +http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg01987.html + +** grep et al should use font-lock to do highlighting, so that they respect font-lock-mode. +"can't turn off font-lock" +http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00548.html + +** mah@everybody.org, Sep 18: erc causes emacs to hang with multi-tty +http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg01765.html + +** jbw@macs.hw.ac.uk, Sep 18: before-string property has no effect if display property is empty +http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00094.html +http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg01816.html + +** sdl.web@gmail.com, Sep 24: TLS infinite loop. +http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg01720.html -** ams@gnu.org, 9 July: eshell and external commands -http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00385.html +** herring@lanl.gov: find-func: can no longer find adviced subrs +This ought to work. -** jbw@macs.hw.ac.uk, Sep 19: redisplay goes horribly wrong when a -before-string contains multiple display properties -http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg02442.html +** \\{...} produces duplicate entries +http://lists.gnu.org/archive/html/emacs-devel/2007-05/msg00209.html -** jbw@macs.hw.ac.uk, Sep 19: part of display property on before-string - property is not displayed -http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg00138.html +** menu indications of key bindings for remapped commands +http://lists.gnu.org/archive/html/emacs-devel/2007-05/msg01339.html -** lekktu@gmail.com, Oct 11: frame-local variables weirdness -I proposed a patch, which fixed this and seemed right, but the patch -caused other problems. They are being investigated now. +** tromey@redhat.com: two View-mode "quit" bugs +http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00103.html +** rms: gnus-dired.el is a mistake. Those features should not +be part of Gnus. They should be moved to some other part of Emacs. * DOCUMENTATION diff --cc doc/emacs/ChangeLog index 544cdd8f67,6b8affa488..9d5e6158f3 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -6,27 -2,11 +6,32 @@@ * misc.texi (Interactive Shell): Correct INSIDE_EMACS reference. +2007-10-11 Eric S. Raymond + + * emacs.texi: + * files.texi (Version Systems): Minor fixes to version-control material + suggseted by RMS and Robert J. Chassell. + +2007-10-10 Eric S. Raymond + + * files.texi (Version Systems): + * vc-xtra.texi: + * vc1-xtra.texi: + * vc2-xtra.texi: Merge in changes for new VC with fileset-oriented + operations. Change of terminology from 'version' to `revision'. + Revise text for adequate description of VCSes with monotonic IDs. + * emacs.texi: Change of terminology from 'version' to `revision'. + +2007-10-09 Eric S. Raymond + + * files.texi (Version Systems): Describe newer VCses. + Reorder the descriptions to be chronological. + + 2007-10-09 Richard Stallman + + * display.texi (Cursor Display): Correct how cursor appears + in nonselected windows. + 2007-10-04 Nick Roberts * building.texi (GDB Graphical Interface): Remove references to gdba diff --cc doc/lispref/ChangeLog index b4a9c045cd,4d0b63c7cf..d95597e940 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,13 -1,19 +1,29 @@@ +2007-10-13 Karl Berry + + * elisp.texi (@dircategory): Move to after @copying, + since we want @copying as close as possible to the beginning of + the output. + + 2007-10-12 Richard Stallman + + * elisp.texi (Top): Add Distinguish Interactive to subnode menu. + + * commands.texi (Distinguish Interactive): New node, + broken out from Interactive Call and rewritten. + (Command Loop): Put Distinguish Interactive in menu. + + 2007-10-09 Richard Stallman + + * text.texi (Examining Properties): Mention overlay priority. + + * display.texi (Display Margins): Correct the description + of margin display specifications. + (Replacing Specs): New subnode broken out of Display Property. + +2007-10-06 Juri Linkov + + * text.texi (Filling): Document fill-paragraph-or-region. + 2007-10-05 Juanma Barranquero * display.texi (Auto Faces): Fix typo. diff --cc lisp/ChangeLog index 10164e2e8d,33ed2702a0..3a68b694a3 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -40,6 -3,13 +40,40 @@@ * progmodes/etags.el (select-tags-table): Disable undo in the `*Tags Table List*' buffer. + 2007-10-13 Eli Zaretskii + + * dired.el (dired-warn-writable): New face. + (dired-warn-writable-face): New variable. + (dired-font-lock-keywords): Use dired-warn-writable-face, instead + of dired-warning-face, for group- and world-writable files. + ++2007-10-13 Richard Stallman ++ ++ * files.el (directory-abbrev-alist): Doc fix. ++ ++2007-10-13 Jari Aalto ++ ++ * comint.el (comint-password-prompt-regexp): Add 'LDAP'. ++ ++2007-10-12 Martin Rudalics ++ ++ * frame.el (set-frame-configuration): Assign name parameter only ++ if it has been set explicitly before. ++ ++2007-10-11 Tom Tromey ++ ++ * progmodes/gdb-ui.el (gdb-info-stack-custom): Ensure current ++ frame is visible. ++ ++2007-10-10 Richard Stallman ++ ++ * emacs-lisp/debug.el (debugger-setup-buffer): Disable undo ++ in *Backtrace*. ++ ++ * faces.el (face-font-selection-order): Doc fix. ++ ++ * loadhist.el (unload-feature): Doc fix. ++ 2007-10-13 Glenn Morris * progmodes/octave-mod.el (octave-looking-at-kw): Add doc string. diff --cc lisp/frame.el index 30573db9e6,cbdfa45d4f..1c11829475 --- a/lisp/frame.el +++ b/lisp/frame.el @@@ -941,28 -797,36 +941,35 @@@ is given and non-nil, the unwanted fram (list 'frame-configuration-p configuration))) (let ((config-alist (cdr configuration)) frames-to-delete) - (mapcar (function - (lambda (frame) - (let ((parameters (assq frame config-alist))) - (if parameters - (progn - (modify-frame-parameters - frame - ;; Since we can't set a frame's minibuffer status, - ;; we might as well omit the parameter altogether. - (let* ((parms (nth 1 parameters)) - (mini (assq 'minibuffer parms)) - (name (assq 'name parms)) - (explicit-name (cdr (assq 'explicit-name parms)))) - (when mini (setq parms (delq mini parms))) - ;; Leave name in iff it was set explicitly. - ;; This should fix the behavior reported in - ;; http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01632.html - (when (and name (not explicit-name)) - (setq parms (delq name parms))) - parms)) - (set-window-configuration (nth 2 parameters))) - (setq frames-to-delete (cons frame frames-to-delete)))))) - (frame-list)) - (if nodelete - ;; Note: making frames invisible here was tried - ;; but led to some strange behavior--each time the frame - ;; was made visible again, the window manager asked afresh - ;; for where to put it. - (mapcar 'iconify-frame frames-to-delete) - (mapcar 'delete-frame frames-to-delete)))) + (dolist (frame (frame-list)) + (let ((parameters (assq frame config-alist))) + (if parameters + (progn + (modify-frame-parameters + frame + ;; Since we can't set a frame's minibuffer status, + ;; we might as well omit the parameter altogether. + (let* ((parms (nth 1 parameters)) - (mini (assq 'minibuffer parms))) - (if mini (setq parms (delq mini parms))) ++ (mini (assq 'minibuffer parms)) ++ (name (assq 'name parms)) ++ (explicit-name (cdr (assq 'explicit-name parms)))) ++ (when mini (setq parms (delq mini parms))) ++ ;; Leave name in iff it was set explicitly. ++ ;; This should fix the behavior reported in ++ ;; http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01632.html ++ (when (and name (not explicit-name)) ++ (setq parms (delq name parms))) + parms)) + (set-window-configuration (nth 2 parameters))) + (setq frames-to-delete (cons frame frames-to-delete))))) + (mapc (if nodelete + ;; Note: making frames invisible here was tried + ;; but led to some strange behavior--each time the frame + ;; was made visible again, the window manager asked afresh + ;; for where to put it. + 'iconify-frame + 'delete-frame) + frames-to-delete))) ;;;; Convenience functions for accessing and interactively changing ;;;; frame parameters. diff --cc lisp/url/ChangeLog index 0e4362bce3,146d224435..8f3979debc --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@@ -3,11 -14,14 +14,19 @@@ * url-auth.el (url-basic-auth): Set path to "/" when URL has an empty string filename. + 2007-10-09 Richard Stallman + + * url-parse.el (url-type, url-user, url-password, url-host) + (url-port, url-filename, url-target, url-attributes) + (url-fullness, url-set-type, url-set-user, url-set-password) + (url-set-host, url-set-port, url-set-filename, url-set-target) + (url-set-attributes, url-set-full): Change macros to defuns. + +2007-09-26 Juanma Barranquero + + * url-dav.el (top): + * url-vars.el (top): Use `mapc' rather than `mapcar'. + 2007-09-22 Diane Murray * url-misc.el (url-generic-emulator-loader): Send the port as a diff --cc lisp/url/url-expand.el index df4de29a61,b7efd75b4b..bebdbd9e04 --- a/lisp/url/url-expand.el +++ b/lisp/url/url-expand.el @@@ -135,9 -135,9 +135,10 @@@ path components followed by `..' are re sepchar (substring (url-filename urlobj) (match-beginning 0) (match-end 0))) (setq file (url-filename urlobj))) (setq file (url-expander-remove-relative-links - (concat (url-basepath (url-filename defobj)) file))) + (expand-file-name file + (url-file-directory (url-filename defobj))))) - (url-set-filename urlobj (if query (concat file sepchar query) file)))))) + (setf (url-filename urlobj) + (if query (concat file sepchar query) file)))))) (provide 'url-expand)