summaryrefslogtreecommitdiff
path: root/lisp/progmodes/pascal.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/progmodes/pascal.el')
-rw-r--r--lisp/progmodes/pascal.el25
1 files changed, 3 insertions, 22 deletions
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 422ee9bb6bd..8d3194e6a47 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -47,8 +47,8 @@
;; "reset" "rewrite" "write" "writeln")
;; pascal-separator-keywords '("downto" "else" "mod" "div" "then"))
-;; KNOWN BUGS / BUGREPORTS
-;; =======================
+;; KNOWN BUGS / BUG REPORTS
+;; ========================
;; As far as I know, there are no bugs in the current version of this
;; package. This may not be true however, since I never use this mode
;; myself and therefore would never notice them anyway. If you do
@@ -239,14 +239,6 @@ will do all lineups."
(const :tag "Declarations" declaration)
(const :tag "Case statements" case)))
-(defvar pascal-toggle-completions nil
- "If non-nil, `pascal-complete-word' tries all possible completions.
-Repeated use of \\[pascal-complete-word] then shows all
-completions in turn, instead of displaying a list of all possible
-completions.")
-(make-obsolete-variable 'pascal-toggle-completions
- 'completion-cycle-threshold "24.1")
-
(defcustom pascal-type-keywords
'("array" "file" "packed" "char" "integer" "real" "string" "record")
"Keywords for types used when completing a word in a declaration or parmlist.
@@ -1297,13 +1289,6 @@ indent of the current line in parameterlist."
(when (> e b)
(list b e #'pascal-completion))))
-(define-obsolete-function-alias 'pascal-complete-word
- 'completion-at-point "24.1")
-
-(define-obsolete-function-alias 'pascal-show-completions
- 'completion-help-at-point "24.1")
-
-
(defun pascal-get-default-symbol ()
"Return symbol around current point as a string."
(save-excursion
@@ -1357,9 +1342,7 @@ The default is a name found in the buffer around point."
default ""))
(label
;; Do completion with default.
- (completing-read (if (not (string= default ""))
- (concat "Label (default " default "): ")
- "Label: ")
+ (completing-read (format-prompt "Label" default)
;; Complete with the defuns found in the
;; current-buffer.
(let ((buf (current-buffer)))
@@ -1384,8 +1367,6 @@ The default is a name found in the buffer around point."
;;;
(defvar pascal-outline-map
(let ((map (make-sparse-keymap)))
- (if (fboundp 'set-keymap-name)
- (set-keymap-name map 'pascal-outline-map))
(define-key map "\M-\C-a" 'pascal-outline-prev-defun)
(define-key map "\M-\C-e" 'pascal-outline-next-defun)
(define-key map "\C-c\C-d" 'pascal-outline-goto-defun)