diff options
| author | Juanma Barranquero | 2009-12-03 01:43:23 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2009-12-03 01:43:23 +0000 |
| commit | 3bb8691bce175b32e289beaa57bf0ed05f0ab0e4 (patch) | |
| tree | aacfbab22069e503de2119e6f3aa7f86ce2c86db | |
| parent | f72f0c2393770f183c703faa87492978e0e73b9f (diff) | |
| download | emacs-3bb8691bce175b32e289beaa57bf0ed05f0ab0e4.tar.gz emacs-3bb8691bce175b32e289beaa57bf0ed05f0ab0e4.zip | |
* progmodes/pascal.el: Require CL when compiling (for lexical-let).
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/pascal.el | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1597c9740da..99b30853b7b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-12-03 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * progmodes/pascal.el: Require CL when compiling (for lexical-let). | ||
| 4 | |||
| 1 | 2009-12-03 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2009-12-03 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * hippie-exp.el (try-expand-dabbrev-visible): Preserve point in the | 7 | * hippie-exp.el (try-expand-dabbrev-visible): Preserve point in the |
| @@ -80,7 +84,7 @@ | |||
| 80 | * comint.el (comint-insert-input): Ignore clicks to the right of | 84 | * comint.el (comint-insert-input): Ignore clicks to the right of |
| 81 | the field. Reported by Bob Nnamtrop <bobnnamtrop@gmail.com>. | 85 | the field. Reported by Bob Nnamtrop <bobnnamtrop@gmail.com>. |
| 82 | 86 | ||
| 83 | * vc.el (vc-print-log-internal): Don't wait for the prcess to | 87 | * vc.el (vc-print-log-internal): Don't wait for the process to |
| 84 | terminate before setting up the major mode. | 88 | terminate before setting up the major mode. |
| 85 | 89 | ||
| 86 | * pcmpl-unix.el (pcomplete/cd): Complete more than one argument, just | 90 | * pcmpl-unix.el (pcomplete/cd): Complete more than one argument, just |
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el index 195dd47b44b..279d4a33f9a 100644 --- a/lisp/progmodes/pascal.el +++ b/lisp/progmodes/pascal.el | |||
| @@ -60,6 +60,8 @@ | |||
| 60 | 60 | ||
| 61 | ;;; Code: | 61 | ;;; Code: |
| 62 | 62 | ||
| 63 | (eval-when-compile (require 'cl)) | ||
| 64 | |||
| 63 | (defgroup pascal nil | 65 | (defgroup pascal nil |
| 64 | "Major mode for editing Pascal source in Emacs." | 66 | "Major mode for editing Pascal source in Emacs." |
| 65 | :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces) | 67 | :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces) |
| @@ -1141,7 +1143,7 @@ indent of the current line in parameterlist." | |||
| 1141 | "\\<\\(" pascal-str "[a-zA-Z0-9_.]*\\)\\>")) | 1143 | "\\<\\(" pascal-str "[a-zA-Z0-9_.]*\\)\\>")) |
| 1142 | (pascal-all ()) | 1144 | (pascal-all ()) |
| 1143 | match) | 1145 | match) |
| 1144 | 1146 | ||
| 1145 | (if (not (looking-at "\\<\\(function\\|procedure\\)\\>")) | 1147 | (if (not (looking-at "\\<\\(function\\|procedure\\)\\>")) |
| 1146 | (re-search-backward "\\<\\(function\\|procedure\\)\\>" nil t)) | 1148 | (re-search-backward "\\<\\(function\\|procedure\\)\\>" nil t)) |
| 1147 | (forward-char 1) | 1149 | (forward-char 1) |
| @@ -1398,7 +1400,7 @@ With optional second arg non-nil, STR is the complete name of the instruction." | |||
| 1398 | "[a-zA-Z_]" | 1400 | "[a-zA-Z_]" |
| 1399 | pascal-str)))) | 1401 | pascal-str)))) |
| 1400 | (goto-char (point-min)) | 1402 | (goto-char (point-min)) |
| 1401 | 1403 | ||
| 1402 | ;; Build a list of all possible completions | 1404 | ;; Build a list of all possible completions |
| 1403 | (while (re-search-forward pascal-str nil t) | 1405 | (while (re-search-forward pascal-str nil t) |
| 1404 | (push (match-string 2) pascal-all))) | 1406 | (push (match-string 2) pascal-all))) |
| @@ -1413,7 +1415,7 @@ The default is a name found in the buffer around point." | |||
| 1413 | (let* ((default (pascal-get-default-symbol)) | 1415 | (let* ((default (pascal-get-default-symbol)) |
| 1414 | (default (if (pascal-comp-defun default nil 'lambda) | 1416 | (default (if (pascal-comp-defun default nil 'lambda) |
| 1415 | default "")) | 1417 | default "")) |
| 1416 | (label | 1418 | (label |
| 1417 | ;; Do completion with default | 1419 | ;; Do completion with default |
| 1418 | (completing-read (if (not (string= default "")) | 1420 | (completing-read (if (not (string= default "")) |
| 1419 | (concat "Label (default " default "): ") | 1421 | (concat "Label (default " default "): ") |