From: Juanma Barranquero Date: Thu, 3 Dec 2009 01:43:23 +0000 (+0000) Subject: * progmodes/pascal.el: Require CL when compiling (for lexical-let). X-Git-Tag: emacs-pretest-23.1.90~116 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3bb8691bce175b32e289beaa57bf0ed05f0ab0e4;p=emacs.git * progmodes/pascal.el: Require CL when compiling (for lexical-let). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1597c9740da..99b30853b7b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2009-12-03 Juanma Barranquero + + * progmodes/pascal.el: Require CL when compiling (for lexical-let). + 2009-12-03 Stefan Monnier * 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 . - * 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 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 @@ ;;; 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 @@ indent of the current line in parameterlist." "\\<\\(" 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 @@ With optional second arg non-nil, STR is the complete name of the instruction." "[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 @@ The default is a name found in the buffer around point." (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 "): ")