Mercurial > emacs
changeset 106378:f7a46a812653
* progmodes/pascal.el: Require CL when compiling (for lexical-let).
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 03 Dec 2009 01:43:23 +0000 |
| parents | 10ceddf3698e |
| children | d1ddac1568a0 |
| files | lisp/ChangeLog lisp/progmodes/pascal.el |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Dec 03 01:33:56 2009 +0000 +++ b/lisp/ChangeLog Thu Dec 03 01:43:23 2009 +0000 @@ -1,3 +1,7 @@ +2009-12-03 Juanma Barranquero <lekktu@gmail.com> + + * progmodes/pascal.el: Require CL when compiling (for lexical-let). + 2009-12-03 Stefan Monnier <monnier@iro.umontreal.ca> * hippie-exp.el (try-expand-dabbrev-visible): Preserve point in the @@ -80,7 +84,7 @@ * comint.el (comint-insert-input): Ignore clicks to the right of the field. Reported by Bob Nnamtrop <bobnnamtrop@gmail.com>. - * vc.el (vc-print-log-internal): Don't wait for the prcess to + * vc.el (vc-print-log-internal): Don't wait for the process to terminate before setting up the major mode. * pcmpl-unix.el (pcomplete/cd): Complete more than one argument, just
--- a/lisp/progmodes/pascal.el Thu Dec 03 01:33:56 2009 +0000 +++ b/lisp/progmodes/pascal.el Thu Dec 03 01:43:23 2009 +0000 @@ -60,6 +60,8 @@ ;;; Code: +(eval-when-compile (require 'cl)) + (defgroup pascal nil "Major mode for editing Pascal source in Emacs." :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces) @@ -1141,7 +1143,7 @@ "\\<\\(" pascal-str "[a-zA-Z0-9_.]*\\)\\>")) (pascal-all ()) match) - + (if (not (looking-at "\\<\\(function\\|procedure\\)\\>")) (re-search-backward "\\<\\(function\\|procedure\\)\\>" nil t)) (forward-char 1) @@ -1398,7 +1400,7 @@ "[a-zA-Z_]" pascal-str)))) (goto-char (point-min)) - + ;; Build a list of all possible completions (while (re-search-forward pascal-str nil t) (push (match-string 2) pascal-all))) @@ -1413,7 +1415,7 @@ (let* ((default (pascal-get-default-symbol)) (default (if (pascal-comp-defun default nil 'lambda) default "")) - (label + (label ;; Do completion with default (completing-read (if (not (string= default "")) (concat "Label (default " default "): ")