mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Unbreak dabbrev

Browse Source 
This commit partially reverts
edb1f85a27, which results in dabbev
expansion failing due to trying to switch to the null buffer.

* lisp/dabbrev.el (dabbrev--progress-reporter): Restore variable.
(dabbrev--find-expansion): Restore original code.
This commit is contained in:
Daniel Colascione 2018-06-18 20:41:25 -07:00
parent 3057260b47
commit e5a15ee1c2
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lisp/dabbrev.el
View File

@ -327,6 +327,9 @@ this list."
;; The regexp for recognizing a character in an abbreviation.
(defvar dabbrev--abbrev-char-regexp nil)
;; The progress reporter for buffer-scanning progress.
(defvar dabbrev--progress-reporter nil)
;;----------------------------------------------------------------
;; Macros
;;----------------------------------------------------------------
@ -736,19 +739,21 @@ of the start of the occurrence."
;; Put that list in dabbrev--friend-buffer-list.
(unless dabbrev--friend-buffer-list
(setq dabbrev--friend-buffer-list
(dabbrev--make-friend-buffer-list))))
(dabbrev--make-friend-buffer-list))
(setq dabbrev--progress-reporter
(make-progress-reporter
"Scanning for dabbrevs..."
(- (length dabbrev--friend-buffer-list)) 0 0 1 1.5))))
;; Walk through the buffers till we find a match.
(let (expansion)
(dolist-with-progress-reporter
(_ dabbrev--friend-buffer-list)
(make-progress-reporter
"Scanning for dabbrevs..."
0 (length dabbrev--friend-buffer-list) 0 1 1.5)
(while (and (not expansion) dabbrev--friend-buffer-list)
(setq dabbrev--last-buffer (pop dabbrev--friend-buffer-list))
(set-buffer dabbrev--last-buffer)
(progress-reporter-update dabbrev--progress-reporter
(- (length dabbrev--friend-buffer-list)))
(setq dabbrev--last-expansion-location (point-min))
(setq expansion (dabbrev--try-find abbrev nil 1 ignore-case))
(unless expansion (setq dabbrev--friend-buffer-list '())))
(setq expansion (dabbrev--try-find abbrev nil 1 ignore-case)))
(progress-reporter-done dabbrev--progress-reporter)
expansion)))))
;; Compute the list of buffers to scan.