[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] xwidget_mvp f3644c0 1/3: Merge branch 'master' into xwidge
|
From: |
Joakim Verona |
|
Subject: |
[Emacs-diffs] xwidget_mvp f3644c0 1/3: Merge branch 'master' into xwidget_mvp |
|
Date: |
Thu, 26 Feb 2015 13:48:23 +0000 |
branch: xwidget_mvp
commit f3644c04e882a4169ea642f0002f1a37d2ad1ed8
Merge: 028e24c 7932d06
Author: Joakim Verona <address@hidden>
Commit: Joakim Verona <address@hidden>
Merge branch 'master' into xwidget_mvp
---
etc/NEWS | 1 +
lisp/ChangeLog | 31 ++++++++++++++++++++++++++++++-
lisp/emacs-lisp/checkdoc.el | 17 +++++++++--------
lisp/emacs-lisp/lisp.el | 5 +++--
lisp/files.el | 10 +++++-----
lisp/help-mode.el | 6 +++---
lisp/rect.el | 3 +--
lisp/register.el | 17 ++++++++++-------
lisp/simple.el | 6 +++---
lisp/windmove.el | 4 ++--
lisp/winner.el | 2 +-
src/ChangeLog | 5 +++++
src/emacs.c | 5 +----
13 files changed, 74 insertions(+), 38 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index 0295245..f359f91 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -235,6 +235,7 @@ If you need your objects to be named, do it by inheriting
from `eieio-named'.
*** The <class> variables are declared obsolete.
*** The <initarg> variables are declared obsolete.
*** defgeneric and defmethod are declared obsolete.
+*** `constructor' is now an obsolete alias for `make-instance'.
** ido
*** New command `ido-bury-buffer-at-head' bound to C-S-b
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 704ec34..b71b55d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,35 @@
+2015-02-18 Kelly Dean <address@hidden>
+
+ * register.el (jump-to-register):
+ * emacs-lisp/lisp.el (check-parens):
+ Push mark before goto-char so user doesn't lose his previous place.
+
+2015-02-18 Kelly Dean <address@hidden>
+
+ * rect.el (rectangle-mark-mode):
+ Suppress superfluous "Mark set" message from push-mark.
+
+2015-02-18 Kelly Dean <address@hidden>
+
+ * help-mode.el (help-go-back, help-go-forward, help-follow):
+ * simple.el (yank-pop, pop-to-mark-command, exchange-point-and-mark):
+ * winner.el (winner-redo):
+ * windmove.el (windmove-do-window-select):
+ * register.el (jump-to-register, increment-register, insert-register)
+ (append-to-register, prepend-to-register):
+ * files.el (find-alternate-file, abort-if-file-too-large, write-file)
+ (set-visited-file-name):
+ * emacs-lisp/lisp.el (kill-backward-up-list):
+ Use user-error instead of error. (Bug#14480)
+
+2015-02-18 Stefan Monnier <address@hidden>
+
+ * emacs-lisp/checkdoc.el (checkdoc-show-diagnostics): Don't make bogus
+ assumptions about window ordering.
+
2015-02-16 Kelly Dean <address@hidden>
- * lisp/files.el (insert-file-contents-literally): Fix docstring typo.
+ * files.el (insert-file-contents-literally): Fix docstring typo.
2015-02-16 Kelly Dean <address@hidden>
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 47b6e5f..288e25e 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -2619,14 +2619,15 @@ function called to create the messages."
(defun checkdoc-show-diagnostics ()
"Display the checkdoc diagnostic buffer in a temporary window."
(if checkdoc-pending-errors
- (let ((b (get-buffer checkdoc-diagnostic-buffer)))
- (if b (progn (pop-to-buffer b)
- (goto-char (point-max))
- (re-search-backward "\C-l" nil t)
- (beginning-of-line)
- (forward-line 1)
- (recenter 0)))
- (other-window -1)
+ (let* ((b (get-buffer checkdoc-diagnostic-buffer))
+ (win (if b (display-buffer b))))
+ (when win
+ (with-selected-window win
+ (goto-char (point-max))
+ (re-search-backward "\C-l" nil t)
+ (beginning-of-line)
+ (forward-line 1)
+ (recenter 0)))
(setq checkdoc-pending-errors nil)
nil)))
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 214bed7..67d1487 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -263,7 +263,7 @@ This command assumes point is not in a string or comment."
(backward-up-list arg)
(kill-sexp)
(insert current-sexp))
- (error "Not at a sexp"))))
+ (user-error "Not at a sexp"))))
(defvar beginning-of-defun-function nil
"If non-nil, function for `beginning-of-defun-raw' to call.
@@ -714,7 +714,8 @@ character."
(condition-case data
;; Buffer can't have more than (point-max) sexps.
(scan-sexps (point-min) (point-max))
- (scan-error (goto-char (nth 2 data))
+ (scan-error (push-mark)
+ (goto-char (nth 2 data))
;; Could print (nth 1 data), which is either
;; "Containing expression ends prematurely" or
;; "Unbalanced parentheses", but those may not be so
diff --git a/lisp/files.el b/lisp/files.el
index 8336979..1914ad8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1628,10 +1628,10 @@ killed."
(confirm-nonexistent-file-or-buffer) file-name)
t)))
(unless (run-hook-with-args-until-failure 'kill-buffer-query-functions)
- (error "Aborted"))
+ (user-error "Aborted"))
(and (buffer-modified-p) buffer-file-name
(not (yes-or-no-p "Kill and replace the buffer without saving it? "))
- (error "Aborted"))
+ (user-error "Aborted"))
(let ((obuf (current-buffer))
(ofile buffer-file-name)
(onum buffer-file-number)
@@ -1844,7 +1844,7 @@ OP-TYPE specifies the file operation being performed (for
message to user)."
(not (y-or-n-p (format "File %s is large (%s), really %s? "
(file-name-nondirectory filename)
(file-size-human-readable size) op-type))))
- (error "Aborted")))
+ (user-error "Aborted")))
(defun warn-maybe-out-of-memory (size)
"Warn if an attempt to open file of SIZE bytes may run out of memory."
@@ -3883,7 +3883,7 @@ the old visited file has been renamed to the new name
FILENAME."
(not no-query)
(not (y-or-n-p (format "A buffer is visiting %s; proceed? "
filename)))
- (error "Aborted")))
+ (user-error "Aborted")))
(or (equal filename buffer-file-name)
(progn
(and filename (lock-buffer filename))
@@ -4007,7 +4007,7 @@ Interactively, confirmation is required unless you supply
a prefix argument."
(listp last-nonmenu-event)
use-dialog-box))
(or (y-or-n-p (format "File `%s' exists; overwrite? " filename))
- (error "Canceled")))
+ (user-error "Canceled")))
(set-visited-file-name filename (not confirm))))
(set-buffer-modified-p t)
;; Make buffer writable if file is writable.
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index b8b129d..d6679e9 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -724,14 +724,14 @@ BUFFER or FRAME."
(interactive)
(if help-xref-stack
(help-xref-go-back (current-buffer))
- (error "No previous help buffer")))
+ (user-error "No previous help buffer")))
(defun help-go-forward ()
"Go back to next topic in this help buffer."
(interactive)
(if help-xref-forward-stack
(help-xref-go-forward (current-buffer))
- (error "No next help buffer")))
+ (user-error "No next help buffer")))
(defun help-do-xref (_pos function args)
"Call the help cross-reference function FUNCTION with args ARGS.
@@ -754,7 +754,7 @@ a proper [back] button."
For the cross-reference format, see `help-make-xrefs'."
(interactive)
- (error "No cross-reference here"))
+ (user-error "No cross-reference here"))
(defun help-follow-symbol (&optional pos)
"In help buffer, show docs for symbol at POS, defaulting to point.
diff --git a/lisp/rect.el b/lisp/rect.el
index c5a5486..75585d2 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -586,8 +586,7 @@ Activates the region if needed. Only lasts until the
region is deactivated."
(add-hook 'deactivate-mark-hook
(lambda () (rectangle-mark-mode -1)))
(unless (region-active-p)
- (push-mark)
- (activate-mark)
+ (push-mark (point) t t)
(message "Mark set (rectangle mode)"))))
(defun rectangle-exchange-point-and-mark (&optional arg)
diff --git a/lisp/register.el b/lisp/register.el
index a60181e..7afbc06 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -252,19 +252,22 @@ Interactively, reads the register using
`register-read-with-preview'."
(goto-char (cadr val)))
((markerp val)
(or (marker-buffer val)
- (error "That register's buffer no longer exists"))
+ (user-error "That register's buffer no longer exists"))
(switch-to-buffer (marker-buffer val))
+ (unless (or (= (point) (marker-position val))
+ (eq last-command 'jump-to-register))
+ (push-mark))
(goto-char val))
((and (consp val) (eq (car val) 'file))
(find-file (cdr val)))
((and (consp val) (eq (car val) 'file-query))
(or (find-buffer-visiting (nth 1 val))
(y-or-n-p (format "Visit file %s again? " (nth 1 val)))
- (error "Register access aborted"))
+ (user-error "Register access aborted"))
(find-file (nth 1 val))
(goto-char (nth 2 val)))
(t
- (error "Register doesn't contain a buffer position or configuration")))))
+ (user-error "Register doesn't contain a buffer position or
configuration")))))
(defun register-swap-out ()
"Turn markers into file-query references when a buffer is killed."
@@ -316,7 +319,7 @@ Interactively, reads the register using
`register-read-with-preview'."
(set-register register (+ number register-val))))
((or (not register-val) (stringp register-val))
(append-to-register register (region-beginning) (region-end) prefix))
- (t (error "Register does not contain a number or text")))))
+ (t (user-error "Register does not contain a number or text")))))
(defun view-register (register)
"Display what is contained in register named REGISTER.
@@ -449,7 +452,7 @@ Interactively, reads the register using
`register-read-with-preview'."
((and (markerp val) (marker-position val))
(princ (marker-position val) (current-buffer)))
(t
- (error "Register does not contain text"))))
+ (user-error "Register does not contain text"))))
(if (not arg) (exchange-point-and-mark)))
(defun copy-to-register (register start end &optional delete-flag region)
@@ -492,7 +495,7 @@ Interactively, reads the register using
`register-read-with-preview'."
(set-register
register (cond ((not reg) text)
((stringp reg) (concat reg separator text))
- (t (error "Register does not contain text")))))
+ (t (user-error "Register does not contain text")))))
(setq deactivate-mark t)
(cond (delete-flag
(delete-region start end))
@@ -516,7 +519,7 @@ Interactively, reads the register using
`register-read-with-preview'."
(set-register
register (cond ((not reg) text)
((stringp reg) (concat text separator reg))
- (t (error "Register does not contain text")))))
+ (t (user-error "Register does not contain text")))))
(setq deactivate-mark t)
(cond (delete-flag
(delete-region start end))
diff --git a/lisp/simple.el b/lisp/simple.el
index 967fbc6..b78286d 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4326,7 +4326,7 @@ When this command inserts killed text into the buffer, it
honors
doc string for `insert-for-yank-1', which see."
(interactive "*p")
(if (not (eq last-command 'yank))
- (error "Previous command was not a yank"))
+ (user-error "Previous command was not a yank"))
(setq this-command 'yank)
(unless arg (setq arg 1))
(let ((inhibit-read-only t)
@@ -4958,7 +4958,7 @@ Start discarding off end if gets this big."
\(Does not affect global mark ring)."
(interactive)
(if (null (mark t))
- (error "No mark set in this buffer")
+ (user-error "No mark set in this buffer")
(if (= (point) (mark t))
(message "Mark popped"))
(goto-char (mark t))
@@ -5107,7 +5107,7 @@ mode temporarily."
(let ((omark (mark t))
(temp-highlight (eq (car-safe transient-mark-mode) 'only)))
(if (null omark)
- (error "No mark set in this buffer"))
+ (user-error "No mark set in this buffer"))
(set-mark (point))
(goto-char omark)
(cond (temp-highlight
diff --git a/lisp/windmove.el b/lisp/windmove.el
index d857dfc..c461a00 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -479,10 +479,10 @@ DIR, ARG, and WINDOW are handled as by
`windmove-other-window-loc'.
If no window is at direction DIR, an error is signaled."
(let ((other-window (windmove-find-other-window dir arg window)))
(cond ((null other-window)
- (error "No window %s from selected window" dir))
+ (user-error "No window %s from selected window" dir))
((and (window-minibuffer-p other-window)
(not (minibuffer-window-active-p other-window)))
- (error "Minibuffer is inactive"))
+ (user-error "Minibuffer is inactive"))
(t
(select-window other-window)))))
diff --git a/lisp/winner.el b/lisp/winner.el
index f244003..fdf6213 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -415,7 +415,7 @@ In other words, \"undo\" changes in window configuration."
(ring-ref winner-pending-undo-ring 0)))
(unless (eq (selected-window) (minibuffer-window))
(message "Winner undid undo")))
- (t (error "Previous command was not a `winner-undo'"))))
+ (t (user-error "Previous command was not a `winner-undo'"))))
(provide 'winner)
;;; winner.el ends here
diff --git a/src/ChangeLog b/src/ChangeLog
index 8a3b534..1c4758f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-18 Eli Zaretskii <address@hidden>
+
+ * emacs.c (Fkill_emacs): Exit with specified exit code even if
+ stdin is at EOF. (Bug#19897)
+
2015-02-18 Oscar Fuentes <address@hidden>
* keyboard.c (read_char): When there is an input method function,
diff --git a/src/emacs.c b/src/emacs.c
index 7bcc512..897433d 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1902,9 +1902,6 @@ all of which are called before Emacs is actually killed.
*/
GCPRO1 (arg);
- if (feof (stdin))
- arg = Qt;
-
/* Fsignal calls emacs_abort () if it sees that waiting_for_input is
set. */
waiting_for_input = 0;
@@ -1916,7 +1913,7 @@ all of which are called before Emacs is actually killed.
*/
x_clipboard_manager_save_all ();
#endif
- shut_down_emacs (0, STRINGP (arg) ? arg : Qnil);
+ shut_down_emacs (0, (STRINGP (arg) && !feof (stdin)) ? arg : Qnil);
#ifdef HAVE_NS
ns_release_autorelease_pool (ns_pool);