mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

* lisp/simple.el (goto-line-read-args): Use number-at-point (bug#45199)

Browse Source 
* lisp/subr.el (goto-char--read-natnum-interactive): Add the value of
point to the end of default values, and move function slightly higher.
This commit is contained in:
Juri Linkov 2020-12-20 22:05:51 +02:00
parent ecb5ebf156
commit 1a7033f1f3
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/simple.el
View File

@ -1264,7 +1264,6 @@ that uses or sets the mark."
;; minibuffer, this is at the end of the prompt.
(goto-char (minibuffer-prompt-end)))
;; Counting lines, one way or another.
(defvar goto-line-history nil
@ -1276,15 +1275,8 @@ that uses or sets the mark."
(if (and current-prefix-arg (not (consp current-prefix-arg)))
(list (prefix-numeric-value current-prefix-arg))
;; Look for a default, a number in the buffer at point.
(let* ((default
(save-excursion
(skip-chars-backward "0-9")
(if (looking-at "[0-9]")
(string-to-number
(buffer-substring-no-properties
(point)
(progn (skip-chars-forward "0-9")
(point)))))))
(let* ((number (number-at-point))
(default (and (natnump number) number))
;; Decide if we're switching buffers.
(buffer
(if (consp current-prefix-arg)

18
lisp/subr.el
View File

@ -2719,6 +2719,15 @@ floating point support."
(push (cons t read) unread-command-events)
nil))))))
(defun goto-char--read-natnum-interactive (prompt)
"Get a natural number argument, optionally prompting with PROMPT.
If there is a natural number at point, use it as default."
(if (and current-prefix-arg (not (consp current-prefix-arg)))
(list (prefix-numeric-value current-prefix-arg))
(let* ((number (number-at-point))
(default (and (natnump number) number)))
(list (read-number prompt (list default (point)))))))
(defvar read-char-history nil
"The default history for the `read-char-from-minibuffer' function.")
@ -2820,15 +2829,6 @@ There is no need to explicitly add `help-char' to CHARS;
(message "%s%s" prompt (char-to-string char))
char))
(defun goto-char--read-natnum-interactive (prompt)
"Get a natural number argument, optionally prompting with PROMPT.
If there is a natural number at point, use it as default."
(if (and current-prefix-arg (not (consp current-prefix-arg)))
(list (prefix-numeric-value current-prefix-arg))
(let* ((number (number-at-point))
(default (and (natnump number) number)))
(list (read-number prompt default)))))
;; Behind display-popup-menus-p test.
(declare-function x-popup-dialog "menu.c" (position contents &optional header))