Mercurial > emacs
changeset 107214:6f4137affc72
Merge from trunk
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Fri, 19 Feb 2010 14:11:21 +0100 |
| parents | 4e1df9366cdd (current diff) 19bad34b0d81 (diff) |
| children | 10f33dae12b7 |
| files | |
| diffstat | 8 files changed, 72 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/trouble.texi Thu Feb 18 14:20:39 2010 +0100 +++ b/doc/emacs/trouble.texi Fri Feb 19 14:11:21 2010 +0100 @@ -1023,7 +1023,7 @@ rest of Emacs. The development version of Emacs can be downloaded from the -repository, where it is actively maintained by a group of developers. +repository where it is actively maintained by a group of developers. See the Emacs project page @url{http://savannah.gnu.org/projects/emacs/} for details.
--- a/lisp/ChangeLog Thu Feb 18 14:20:39 2010 +0100 +++ b/lisp/ChangeLog Fri Feb 19 14:11:21 2010 +0100 @@ -1,3 +1,25 @@ +2010-02-19 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gdb-ui.el (gdb-assembler-handler): Accommodate change + of disassemble output in GDB 7.1. + +2010-02-19 Glenn Morris <rgm@gnu.org> + + * progmodes/f90.el (f90-electric-insert): Give it a delete-selection + property. (Bug#5593) + +2010-02-18 Sam Steingold <sds@gnu.org> + + * vc-cvs.el (vc-cvs-merge-news): Yet another fix of message parsing. + +2010-02-18 Stefan Monnier <monnier@iro.umontreal.ca> + + Use abbreviated file names in bookmarks (bug#5591). + * bookmark.el (bookmark-maybe-load-default-file): Remove redundant + calls to expand-file-name. + (bookmark-relocate): Use abbreviated file names in bookmarks. + (bookmark-load): Use abbreviated file names in messages. + 2010-02-18 Michael Albinus <michael.albinus@gmx.de> * net/tramp.el (tramp-handle-directory-files): When FULL, do not @@ -25,8 +47,8 @@ 2010-02-16 Michael Albinus <michael.albinus@gmx.de> - * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix - errors in copying directories. + * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): + Fix errors in copying directories. (tramp-handle-add-name-to-file, tramp-handle-copy-directory) (tramp-do-copy-or-rename-file, tramp-handle-delete-directory) (tramp-handle-delete-file) @@ -52,8 +74,7 @@ * cedet/srecode.el (srecode): * cedet/semantic.el (semantic): Put in tools and extensions group. - * nxml/nxml-mode.el (nxml-faces): Remove from font-lock-faces - group. + * nxml/nxml-mode.el (nxml-faces): Remove from font-lock-faces group. * textmodes/flyspell.el (flyspell-word): Obey the offset specified by ispell-parse-output (Bug#5575). @@ -170,8 +191,7 @@ 2010-02-08 Jose E. Marchesi <jemarch@gnu.org> * progmodes/ada-mode.el (ada-in-numeric-literal-p): New function. - (ada-adjust-case): Don't adjust case in hexadecimal number - literals. + (ada-adjust-case): Don't adjust case in hexadecimal number literals. 2010-02-08 Kenichi Handa <handa@m17n.org>
--- a/lisp/bookmark.el Thu Feb 18 14:20:39 2010 +0100 +++ b/lisp/bookmark.el Fri Feb 19 14:11:21 2010 +0100 @@ -958,14 +958,14 @@ (and ;; Possibly the old bookmark file, "~/.emacs-bkmrks", needs ;; to be renamed. - (file-exists-p (expand-file-name bookmark-old-default-file)) - (not (file-exists-p (expand-file-name bookmark-default-file))) - (rename-file (expand-file-name bookmark-old-default-file) - (expand-file-name bookmark-default-file))) + (file-exists-p bookmark-old-default-file) + (not (file-exists-p bookmark-default-file)) + (rename-file bookmark-old-default-file + bookmark-default-file)) ;; return t so the `and' will continue... t) - (file-readable-p (expand-file-name bookmark-default-file)) + (file-readable-p bookmark-default-file) (bookmark-load bookmark-default-file t t) (setq bookmarks-already-loaded t))) @@ -1152,10 +1152,11 @@ (bookmark-maybe-historicize-string bookmark) (bookmark-maybe-load-default-file) (let* ((bmrk-filename (bookmark-get-filename bookmark)) - (newloc (expand-file-name - (read-file-name - (format "Relocate %s to: " bookmark) - (file-name-directory bmrk-filename))))) + (newloc (abbreviate-file-name + (expand-file-name + (read-file-name + (format "Relocate %s to: " bookmark) + (file-name-directory bmrk-filename)))))) (bookmark-set-filename bookmark newloc) (setq bookmark-alist-modification-count (1+ bookmark-alist-modification-count)) @@ -1432,7 +1433,7 @@ ;;but there's no better default, and ;;I guess it's better than none at all. "~/" bookmark-default-file 'confirm))) - (setq file (expand-file-name file)) + (setq file (abbreviate-file-name (expand-file-name file))) (if (not (file-readable-p file)) (error "Cannot read bookmark file %s" file) (if (null no-msg) @@ -1453,7 +1454,8 @@ (setq bookmark-alist-modification-count (1+ bookmark-alist-modification-count))) (if (string-equal - (expand-file-name bookmark-default-file) + (abbreviate-file-name + (expand-file-name bookmark-default-file)) file) (setq bookmarks-already-loaded t)) (bookmark-bmenu-surreptitiously-rebuild-list))
--- a/lisp/progmodes/f90.el Thu Feb 18 14:20:39 2010 +0100 +++ b/lisp/progmodes/f90.el Fri Feb 19 14:11:21 2010 +0100 @@ -1356,6 +1356,8 @@ (if auto-fill-function (f90-do-auto-fill) ; also updates line (f90-update-line))) +;; Behave like self-insert-command for delete-selection-mode (bug#5593). +(put 'f90-electric-insert 'delete-selection t) (defun f90-get-correct-indent () "Get correct indent for a line starting with line number.
--- a/lisp/progmodes/gdb-ui.el Thu Feb 18 14:20:39 2010 +0100 +++ b/lisp/progmodes/gdb-ui.el Fri Feb 19 14:11:21 2010 +0100 @@ -3573,18 +3573,24 @@ (setq gdb-pending-triggers (delq 'gdb-invalidate-assembler gdb-pending-triggers)) - (let ((buf (gdb-get-buffer 'gdb-assembler-buffer))) - (and buf - (with-current-buffer buf - (let* ((window (get-buffer-window buf 0)) - (p (window-point window)) - (buffer-read-only nil)) - (erase-buffer) - (insert-buffer-substring (gdb-get-buffer-create + (let ((buf (gdb-get-buffer 'gdb-partial-output-buffer))) + (with-current-buffer buf + (goto-char (point-min)) + ;; The disassemble command in GDB 7.1 onwards displays an overlay arrow. + (while (re-search-forward "\\(^ 0x\\|=> 0x\\)" nil t) + (replace-match "0x" nil nil)))) + (let ((buf (gdb-get-buffer 'gdb-assembler-buffer))) + (and buf + (with-current-buffer buf + (let* ((window (get-buffer-window buf 0)) + (p (window-point window)) + (buffer-read-only nil)) + (erase-buffer) + (insert-buffer-substring (gdb-get-buffer-create 'gdb-partial-output-buffer)) - (set-window-point window p))))) - ;; put customisation here - (gdb-assembler-custom)) + (set-window-point window p))))) + ;; put customisation here + (gdb-assembler-custom)) (defun gdb-assembler-custom () (let ((buffer (gdb-get-buffer 'gdb-assembler-buffer))
--- a/lisp/vc-cvs.el Thu Feb 18 14:20:39 2010 +0100 +++ b/lisp/vc-cvs.el Fri Feb 19 14:11:21 2010 +0100 @@ -459,8 +459,8 @@ (if (re-search-forward (concat "^\\([CMUP] \\)?" (regexp-quote - (substring file (length (expand-file-name - "." default-directory)))) + (substring file (1+ (length (expand-file-name + "." default-directory))))) "\\( already contains the differences between \\)?") nil t) (cond
--- a/src/ChangeLog Thu Feb 18 14:20:39 2010 +0100 +++ b/src/ChangeLog Fri Feb 19 14:11:21 2010 +0100 @@ -1,3 +1,7 @@ +2010-02-18 Stefan Monnier <monnier@iro.umontreal.ca> + + * term.c (fatal): Add a final \n if needed (bug#5596). + 2010-02-18 Chong Yidong <cyd@stupidchicken.com> * nsterm.m (ns_ring_bell): Revert last change (Bug#5569). @@ -8,15 +12,15 @@ 2010-02-18 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny change) - * coding.c (record_conversion_result): Handle - CODING_RESULT_INSUFFICIENT_DST. + * coding.c (record_conversion_result): + Handle CODING_RESULT_INSUFFICIENT_DST. (decode_coding_object): Record CODING_RESULT_INSUFFICIENT_MEM on memory allocation error. 2010-02-17 Kenichi Handa <handa@m17n.org> - * coding.c (decode_coding_ccl): Don't setup ccl program here. Fix - for the case that the output buffer is fullfilled. + * coding.c (decode_coding_ccl): Don't setup ccl program here. + Fix for the case that the output buffer is fullfilled. (decode_coding): Setup ccl program here. Keep looping when the decoder stopped because the output buffer is fullfilled (bug#5534). @@ -27,7 +31,7 @@ * xterm.c (x_clear_frame_area): Call gtk_widget_queue_draw if USE_GTK, bug #5571. - (XTflash): Use Gdk-routines if USE_GTK so scroll bars doesn't get + (XTflash): Use Gdk-routines if USE_GTK so scroll bars don't get overdrawn. 2010-02-10 Jan Djärv <jan.h.d@swipnet.se>
--- a/src/term.c Thu Feb 18 14:20:39 2010 +0100 +++ b/src/term.c Fri Feb 19 14:11:21 2010 +0100 @@ -3938,6 +3938,8 @@ va_start (ap, str); fprintf (stderr, "emacs: "); vfprintf (stderr, str, ap); + if (!(strlen (str) > 0 && str[strlen (str) - 1] == '\n')) + fprintf (stderr, "\n"); va_end (ap); fflush (stderr); exit (1);