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

Make add-mode-abbrev use the active region

Browse Source 
* lisp/abbrev.el (add-mode-abbrev, add-global-abbrev): Document it.
(add-abbrev): If there's an active region, use that as the
expansion (bug#56496).
This commit is contained in:
Lars Ingebrigtsen 2022-07-11 15:34:07 +02:00
parent b3fd71ed10
commit ce31339c83
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lisp/abbrev.el
View File

@ -292,8 +292,11 @@ The saved abbrevs are written to the file specified by
(defun add-mode-abbrev (arg)
"Define a mode-specific abbrev whose expansion is the last word before point.
If there's an active region, use that as the expansion.
Prefix argument ARG says how many words before point to use for the expansion;
zero means the entire region is the expansion.
A negative ARG means to undefine the specified abbrev.
This command reads the abbreviation from the minibuffer.
@ -303,7 +306,7 @@ if the abbreviation is already in the buffer, use that command to define
a mode-specific abbrev by specifying its expansion in the minibuffer.
Don't use this function in a Lisp program; use `define-abbrev' instead."
(interactive "p")
(interactive "P")
(add-abbrev
(if only-global-abbrevs
global-abbrev-table
@ -313,8 +316,11 @@ Don't use this function in a Lisp program; use `define-abbrev' instead."
(defun add-global-abbrev (arg)
"Define a global (all modes) abbrev whose expansion is last word before point.
If there's an active region, use that as the expansion.
Prefix argument ARG says how many words before point to use for the expansion;
zero means the entire region is the expansion.
A negative ARG means to undefine the specified abbrev.
This command reads the abbreviation from the minibuffer.
@ -324,15 +330,21 @@ if the abbreviation is already in the buffer, use that command to define
a global abbrev by specifying its expansion in the minibuffer.
Don't use this function in a Lisp program; use `define-abbrev' instead."
(interactive "p")
(interactive "P")
(add-abbrev global-abbrev-table "Global" arg))
(defun add-abbrev (table type arg)
(let ((exp (and (>= arg 0)
(buffer-substring-no-properties
(point)
(if (= arg 0) (mark)
(save-excursion (forward-word (- arg)) (point))))))
(let ((exp
(cond
((or (and (null arg) (use-region-p))
(zerop (prefix-numeric-value arg)))
(buffer-substring-no-properties (region-beginning) (region-end)))
((> (prefix-numeric-value arg) 0)
(buffer-substring-no-properties
(point)
(save-excursion
(forward-word (- (prefix-numeric-value arg)))
(point))))))
name)
(setq name
(read-string (format (if exp "%s abbrev that expands into \"%s\": "