diff options
Diffstat (limited to 'lisp/dabbrev.el')
| -rw-r--r-- | lisp/dabbrev.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el index 371037312e2..909b86dbbcf 100644 --- a/lisp/dabbrev.el +++ b/lisp/dabbrev.el | |||
| @@ -310,14 +310,14 @@ this list.") | |||
| 310 | ;; variable ELEMENT, and include it in the result | 310 | ;; variable ELEMENT, and include it in the result |
| 311 | ;; if CONDITION evaluates non-nil. | 311 | ;; if CONDITION evaluates non-nil. |
| 312 | (defmacro dabbrev-filter-elements (element list condition) | 312 | (defmacro dabbrev-filter-elements (element list condition) |
| 313 | (` (let (dabbrev-result dabbrev-tail (, element)) | 313 | `(let (dabbrev-result dabbrev-tail ,element) |
| 314 | (setq dabbrev-tail (, list)) | 314 | (setq dabbrev-tail ,list) |
| 315 | (while dabbrev-tail | 315 | (while dabbrev-tail |
| 316 | (setq (, element) (car dabbrev-tail)) | 316 | (setq ,element (car dabbrev-tail)) |
| 317 | (if (, condition) | 317 | (if ,condition |
| 318 | (setq dabbrev-result (cons (, element) dabbrev-result))) | 318 | (setq dabbrev-result (cons ,element dabbrev-result))) |
| 319 | (setq dabbrev-tail (cdr dabbrev-tail))) | 319 | (setq dabbrev-tail (cdr dabbrev-tail))) |
| 320 | (nreverse dabbrev-result)))) | 320 | (nreverse dabbrev-result))) |
| 321 | 321 | ||
| 322 | ;;---------------------------------------------------------------- | 322 | ;;---------------------------------------------------------------- |
| 323 | ;; Exported functions | 323 | ;; Exported functions |
| @@ -569,7 +569,7 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]." | |||
| 569 | (equal abbrev (upcase abbrev))))) | 569 | (equal abbrev (upcase abbrev))))) |
| 570 | 570 | ||
| 571 | ;; Save state for re-expand. | 571 | ;; Save state for re-expand. |
| 572 | (setq dabbrev--last-expansion expansion) | 572 | (setq dabbrev--last-expansion expansion) |
| 573 | (setq dabbrev--last-abbreviation abbrev) | 573 | (setq dabbrev--last-abbreviation abbrev) |
| 574 | (setq dabbrev--last-abbrev-location (point-marker)))))) | 574 | (setq dabbrev--last-abbrev-location (point-marker)))))) |
| 575 | 575 | ||
| @@ -630,7 +630,7 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]." | |||
| 630 | (dabbrev--goto-start-of-abbrev) | 630 | (dabbrev--goto-start-of-abbrev) |
| 631 | (buffer-substring-no-properties | 631 | (buffer-substring-no-properties |
| 632 | dabbrev--last-abbrev-location (point)))) | 632 | dabbrev--last-abbrev-location (point)))) |
| 633 | 633 | ||
| 634 | ;;; Initializes all global variables | 634 | ;;; Initializes all global variables |
| 635 | (defun dabbrev--reset-global-variables () | 635 | (defun dabbrev--reset-global-variables () |
| 636 | ;; dabbrev--last-obarray and dabbrev--last-completion-buffer | 636 | ;; dabbrev--last-obarray and dabbrev--last-completion-buffer |