Minor clean up

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 06b68f35d73114ffb3ebc501518ed7b2de29ef3c..41f9f74e711d3db8b74e640f748aeb501d09d451 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -31,9 +31,6 @@
 (eval-when-compile (require 'cl-lib))
 (eval-when-compile (require 'subr-x))
 
-(define-abbrev-table 'lisp-mode-abbrev-table ()
-  "Abbrev table for Lisp mode.")
-
 (defvar lisp-data-mode-syntax-table
   (let ((table (make-syntax-table))
         (i 0))

diff --git a/lisp/simple.el b/lisp/simple.el
index a406faf414361601d05f8904628761327b7ca6af..d77561d3e89f75c99e044f20d05041002275f4d3 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -699,9 +699,7 @@ With arg N, insert N newlines."
   (interactive "*p")
   (let* ((do-fill-prefix (and fill-prefix (bolp)))
         (do-left-margin (and (bolp) (> (current-left-margin) 0)))
-        (loc (point-marker))
-         ;; Don't expand an abbrev before point.
-        (abbrev-mode nil))
+        (loc (point-marker)))
     (newline n)
     (goto-char loc)
     (while (> n 0)
@@ -7474,8 +7472,7 @@ lines rather than by display lines."
   (or arg (setq arg 1))
   (if (and next-line-add-newlines (= arg 1))
       (if (save-excursion (end-of-line) (eobp))
-         ;; When adding a newline, don't expand an abbrev.
-         (let ((abbrev-mode nil))
+         (progn
            (end-of-line)
            (insert (if use-hard-newlines hard-newline "\n")))
        (line-move arg nil nil try-vscroll))