diff options
| -rw-r--r-- | INSTALL | 18 | ||||
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/image-dired.el | 8 | ||||
| -rw-r--r-- | lisp/progmodes/gdb-mi.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/image.c | 2 |
7 files changed, 31 insertions, 17 deletions
@@ -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) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b47dbacd5a..a259c04402 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,18 @@ +2013-07-20 Glenn Morris <rgm@gnu.org> + + * image-dired.el (image-dired-track-original-file): + Avoid changing point of wrong window. (Bug#14909) + +2013-07-20 Richard Copley <rcopley@gmail.com> (tiny change) + + * progmodes/gdb-mi.el (gdb-done-or-error): + Guard against "%" in gdb output. (Bug#14127) + 2013-07-20 Andreas Schwab <schwab@linux-m68k.org> + * progmodes/sh-script.el (sh-read-variable): Remove interactive + spec. (Bug#14826) + * international/mule.el (coding-system-iso-2022-flags): Fix last change. diff --git a/lisp/image-dired.el b/lisp/image-dired.el index afb940fe33..b196bf7767 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -1039,15 +1039,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 () diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 10472ec581..96215b9bf1 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -2500,7 +2500,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))) diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 07e9bb85c4..29020d9522 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -2401,7 +2401,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) diff --git a/src/ChangeLog b/src/ChangeLog index 4c6bfaa2b1..e6b594258d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-07-20 Glenn Morris <rgm@gnu.org> + + * image.c (Fimage_flush): Fix doc typo. + 2013-07-20 Paul Eggert <eggert@cs.ucla.edu> Fix array bounds violation when pty allocation fails. diff --git a/src/image.c b/src/image.c index 1e3944ac1a..1f8cb520dc 100644 --- a/src/image.c +++ b/src/image.c @@ -1569,7 +1569,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. |