From f7a0389779cedaf4e82684733bf91502b8cfd8c2 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 8 Jul 2013 20:49:53 +0200 Subject: [PATCH 1/6] Fixes: debbugs:14826 * progmodes/sh-script.el (sh-read-variable): Remove interactive spec. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/sh-script.el | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1cf0d190130..e8f9f456f56 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-07-08 Andreas Schwab + + * progmodes/sh-script.el (sh-read-variable): Remove interactive + spec. (Bug#14826) + 2013-07-03 Glenn Morris * subr.el (y-or-n-p): Handle empty prompts. (Bug#14770) diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 7baa1972c58..87d0f598bd6 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -2379,7 +2379,6 @@ which in this buffer is currently %s. (defun sh-read-variable (var) "Read a new value for indentation variable VAR." - (interactive "*variable? ") ;; to test (let ((minibuffer-help-form `(sh-help-string-for-variable (quote ,var))) val) From c54c978e1d11d64419265cb0782bbecff1d417b8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 9 Jul 2013 14:30:24 -0400 Subject: [PATCH 2/6] * INSTALL: Try to clarify role of make distclean. Fixes: debbugs:14833 --- INSTALL | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/INSTALL b/INSTALL index ec19e49b260..83e393d50db 100644 --- a/INSTALL +++ b/INSTALL @@ -70,24 +70,17 @@ sections if you need to. you, but there are no obvious errors, assume that `configure' did its job and proceed. - 4. If you need to run the `configure' script more than once (e.g., - with some non-default options), always clean the source - directories before running `configure' again: - - make distclean - ./configure - - 5. Invoke the `make' program: + 4. Invoke the `make' program: make - 6. If `make' succeeds, it will build an executable program `emacs' + 5. If `make' succeeds, it will build an executable program `emacs' in the `src' directory. You can try this program, to make sure it works: src/emacs -Q - 7. Assuming that the program `src/emacs' starts and displays its + 6. Assuming that the program `src/emacs' starts and displays its opening screen, you can install the program and its auxiliary files into their installation directories: @@ -101,6 +94,11 @@ sections if you need to. You can delete the entire build directory if you do not plan to build Emacs again, but it can be useful to keep for debugging. + If you want to build Emacs again with different configure options, + first clean the source directories: + + make distclean + ./configure Note that the install automatically saves space by compressing (provided you have the `gzip' program) those installed Lisp source (.el) From daca02043b6453e90f5c652b8e2c8d1c6e5354a0 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 11 Jul 2013 13:19:31 -0400 Subject: [PATCH 3/6] ChangeLog fix (no need to merge to trunk) --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 159a1ee4c8b..54853f4a600 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,7 @@ * configure.ac (emacs_broken_SIGIO): Set on gnu-kfreebsd to avoid hang. http://bugs.debian.org/712974 -2013-06-22 Glenn Morris +2013-06-22 Glenn Morris * configure.ac: Include X11/X.h when testing for Xft.h. (Bug#14684) From 8bfcc21a7921eeaa85afd5079de4c896efb9f8e3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 15 Jul 2013 09:03:47 -0700 Subject: [PATCH 4/6] * src/image.c (Fimage_flush): Fix doc typo. --- src/ChangeLog | 4 ++++ src/image.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 95046266751..28899150e96 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-07-15 Glenn Morris + + * image.c (Fimage_flush): Fix doc typo. + 2013-03-11 Glenn Morris * Version 24.3 released. diff --git a/src/image.c b/src/image.c index ce36699767d..e084119a04e 100644 --- a/src/image.c +++ b/src/image.c @@ -1563,7 +1563,7 @@ which is then usually a filename. */) DEFUN ("image-flush", Fimage_flush, Simage_flush, 1, 2, 0, - doc: /* Fush the image with specification SPEC on frame FRAME. + doc: /* Flush the image with specification SPEC on frame FRAME. This removes the image from the Emacs image cache. If SPEC specifies an image file, the next redisplay of this image will read from the current contents of that file. From 188c1ae6034a4775eb0c3e7f65714f9b90efa8a7 Mon Sep 17 00:00:00 2001 From: Richard Copley Date: Thu, 18 Jul 2013 12:56:08 -0400 Subject: [PATCH 5/6] * gdb-mi.el (gdb-done-or-error): Guard against "%" in gdb output (tiny change) Fixes: debbugs:14127 --- lisp/ChangeLog | 5 +++++ lisp/progmodes/gdb-mi.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e8f9f456f56..71a23f1a822 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-07-18 Richard Copley (tiny change) + + * progmodes/gdb-mi.el (gdb-done-or-error): + Guard against "%" in gdb output. (Bug#14127) + 2013-07-08 Andreas Schwab * progmodes/sh-script.el (sh-read-variable): Remove interactive diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index fc3d336cf99..3e3b872fd0e 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -2115,7 +2115,7 @@ current thread and update GDB buffers." ;; MI error - send to minibuffer (when (eq type 'error) ;; Skip "msg=" from `output-field' - (message (read (substring output-field 4))) + (message "%s" (read (substring output-field 4))) ;; Don't send to the console twice. (If it is a console error ;; it is also in the console stream.) (setq output-field nil))) From 862f1c9c3a172cd704e286964705b06aaf68b7fa Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 20 Jul 2013 12:17:32 -0700 Subject: [PATCH 6/6] * lisp/image-dired.el (image-dired-track-original-file): Avoid changing point of wrong window. Fixes: debbugs:14909 --- lisp/ChangeLog | 5 +++++ lisp/image-dired.el | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 71a23f1a822..5cb6371c082 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-07-20 Glenn Morris + + * image-dired.el (image-dired-track-original-file): + Avoid changing point of wrong window. (Bug#14909) + 2013-07-18 Richard Copley (tiny change) * progmodes/gdb-mi.el (gdb-done-or-error): diff --git a/lisp/image-dired.el b/lisp/image-dired.el index f0483e6217a..d101fc63da0 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -1035,15 +1035,15 @@ With prefix argument ARG, remove tag from file at point." See documentation for `image-dired-toggle-movement-tracking'. Interactive use only useful if `image-dired-track-movement' is nil." (interactive) - (let ((old-buf (current-buffer)) + (let* ((old-buf (current-buffer)) (dired-buf (image-dired-associated-dired-buffer)) - (file-name (image-dired-original-file-name))) + (file-name (image-dired-original-file-name)) + (window (image-dired-get-buffer-window dired-buf))) (when (and (buffer-live-p dired-buf) file-name) (set-buffer dired-buf) (if (not (dired-goto-file file-name)) (message "Could not track file") - (set-window-point - (image-dired-get-buffer-window dired-buf) (point))) + (if window (set-window-point window (point)))) (set-buffer old-buf)))) (defun image-dired-toggle-movement-tracking ()