Mercurial > emacs
comparison lisp/abbrev.el @ 90143:146c086df160
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-37
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 241-257)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 59-65)
- Update from CVS
- Merge from emacs--cvs-trunk--0
- (mm-string-to-multibyte): Use Gnus trunk definition.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 14 Apr 2005 05:03:52 +0000 |
parents | 0bdb5a16ae51 7d5a5b63ec13 |
children | 08185296b491 |
comparison
equal
deleted
inserted
replaced
90142:627771f44771 | 90143:146c086df160 |
---|---|
170 (save-excursion | 170 (save-excursion |
171 (goto-char (point-min)) | 171 (goto-char (point-min)) |
172 (while (and (not (eobp)) (re-search-forward "^(" nil t)) | 172 (while (and (not (eobp)) (re-search-forward "^(" nil t)) |
173 (let* ((buf (current-buffer)) | 173 (let* ((buf (current-buffer)) |
174 (table (read buf)) | 174 (table (read buf)) |
175 abbrevs name hook exp count) | 175 abbrevs name hook exp count sys) |
176 (forward-line 1) | 176 (forward-line 1) |
177 (while (progn (forward-line 1) | 177 (while (progn (forward-line 1) |
178 (not (eolp))) | 178 (not (eolp))) |
179 (setq name (read buf) count (read buf) exp (read buf)) | 179 (setq name (read buf) count (read buf)) |
180 (if (equal count '(sys)) | |
181 (setq sys t count (read buf))) | |
182 (setq exp (read buf)) | |
180 (skip-chars-backward " \t\n\f") | 183 (skip-chars-backward " \t\n\f") |
181 (setq hook (if (not (eolp)) (read buf))) | 184 (setq hook (if (not (eolp)) (read buf))) |
182 (skip-chars-backward " \t\n\f") | 185 (skip-chars-backward " \t\n\f") |
183 (setq abbrevs (cons (list name exp hook count) abbrevs))) | 186 (setq abbrevs (cons (list name exp hook count sys) abbrevs))) |
184 (define-abbrev-table table abbrevs))))) | 187 (define-abbrev-table table abbrevs))))) |
185 | 188 |
186 (defun read-abbrev-file (&optional file quietly) | 189 (defun read-abbrev-file (&optional file quietly) |
187 "Read abbrev definitions from file written with `write-abbrev-file'. | 190 "Read abbrev definitions from file written with `write-abbrev-file'. |
188 Optional argument FILE is the name of the file to read; | 191 Optional argument FILE is the name of the file to read; |