From: Eshel Yaron <me@eshelyaron.com>
Date: Mon, 14 Apr 2025 17:00:49 +0000 (+0200)
Subject: Minor clean up
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65d495b797796de741a118005d14c85e9e4bbf27;p=emacs.git

Minor clean up
---

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 06b68f35d73..41f9f74e711 100644
--- 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 a406faf4143..d77561d3e89 100644
--- 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))