(debug-convert-byte-code): Convert the doc info to a string.

[bpt/emacs.git] / lisp / emacs-lisp / lisp.el

diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index f5904be..fd9ae0c 100644 (file)
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -1,6 +1,6 @@
 ;;; lisp.el --- Lisp editing commands for Emacs
 
-;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1994 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: lisp, languages
@@ -32,6 +32,7 @@
   "*Non-nil => regexp to ignore, before the character that starts a defun.
 This is only necessary if the opening paren or brace is not in column 0.
 See `beginning-of-defun'.")
+(make-variable-buffer-local 'defun-prompt-regexp)
 
 (defvar parens-require-spaces t
   "Non-nil => `insert-parentheses' should insert whitespace as needed.")
@@ -217,6 +218,7 @@ before and after, depending on the surrounding characters."
     (setq arg 0))
   (or (eq arg 0) (skip-chars-forward " \t"))
   (and parens-require-spaces
+       (not (bobp))
        (memq (char-syntax (preceding-char)) '(?w ?_ ?\) ))
        (insert " "))
   (insert ?\()
@@ -224,6 +226,7 @@ before and after, depending on the surrounding characters."
     (or (eq arg 0) (forward-sexp arg))
     (insert ?\))
     (and parens-require-spaces
+        (not (eobp))
         (memq (char-syntax (following-char)) '(?w ?_ ?\( ))
         (insert " "))))
 
@@ -276,7 +279,12 @@ function definitions, values or properties are considered."
           (insert completion))
          (t
           (message "Making completion list...")
-          (let ((list (all-completions pattern obarray predicate)))
+          (let ((list (all-completions pattern obarray predicate))
+                (completion-fixup-function
+                 (function (lambda () (if (save-excursion
+                                            (goto-char (max (point-min) (- (point) 4)))
+                                            (looking-at " <f>"))
+                                          (forward-char -4))))))
             (or (eq predicate 'fboundp)
                 (let (new)
                   (while list
@@ -286,7 +294,7 @@ function definitions, values or properties are considered."
                                     new))
                     (setq list (cdr list)))
                   (setq list (nreverse new))))
-            (with-output-to-temp-buffer " *Completions*"
+            (with-output-to-temp-buffer "*Completions*"
               (display-completion-list list)))
           (message "Making completion list...%s" "done")))))