emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/smalltalk-mode a12fa2c: Eliminate reliance on autoconf


From: Stefan Monnier
Subject: [elpa] externals/smalltalk-mode a12fa2c: Eliminate reliance on autoconf and fix up copyright for GNU ELPA
Date: Fri, 12 Apr 2019 16:21:12 -0400 (EDT)

branch: externals/smalltalk-mode
commit a12fa2c9a06d9b9c761fa8e9ec47c8fe57eaee2f
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    Eliminate reliance on autoconf and fix up copyright for GNU ELPA
    
    * .gitignore: New file.
    
    * gst-mode.el: Rename from gst-mode.el.in.
    (gst-program-name): Presume `gst` can be found in $PATH.
    (gst): Add autoload cookie.
    
    * smalltalk-mode-init.el.in: Delete file.
    Move contents to smalltalk-mode.el.
    
    * smalltalk-mode.el: Add maintainer address.
    (auto-mode-alist, inhibit-local-variables-regexps):
    Add entry for .star, taken from smalltalk-mode-init.el.in
---
 .gitignore                    |  3 +++
 gst-mode.el.in => gst-mode.el | 53 +++++++++++++++++++++++--------------------
 smalltalk-mode-init.el.in     | 19 ----------------
 smalltalk-mode.el             | 28 ++++++++++++++++++++---
 4 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fcf24f1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.elc
+smalltalk-mode-pkg.el
+smalltalk-mode-autoloads.el
diff --git a/gst-mode.el.in b/gst-mode.el
similarity index 91%
rename from gst-mode.el.in
rename to gst-mode.el
index 15713ac..02f820d 100644
--- a/gst-mode.el.in
+++ b/gst-mode.el
@@ -1,29 +1,31 @@
+;;; gst-mode.el --- Interaction with GNU Smalltalk subprocess
+;;
+;; Copyright 1988-2019  Free Software Foundation, Inc.
+;; Written by Steve Byrne.
+;;
+;; This file is part of GNU Smalltalk.
+;;
+;; GNU Smalltalk is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by the Free
+;; Software Foundation; either version 3, or (at your option) any later
+;; version.
+;;
+;; GNU Smalltalk is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+;; for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;
-;;; Copyright 1988-92, 1994-95, 1999, 2000, 2003, 2007, 2008
-;;; Free Software Foundation, Inc.
-;;; Written by Steve Byrne.
-;;;
-;;; This file is part of GNU Smalltalk.
-;;;
-;;; GNU Smalltalk is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by the Free
-;;; Software Foundation; either version 2, or (at your option) any later 
-;;; version.
-;;;
-;;; GNU Smalltalk is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-;;; for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License along
-;;; with GNU Smalltalk; see the file COPYING.  If not, write to the Free
-;;; Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 
02110-1301, USA.
-;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;; Incorporates Frank Caggiano's changes for Emacs 19.
-;;; Updates and changes for Emacs 20 and 21 by David Forster
+;;; Commentary:
+
+;; Incorporates Frank Caggiano's changes for Emacs 19.
+;; Updates and changes for Emacs 20 and 21 by David Forster
+
+;;; Code:
 
 (require 'comint)
 
@@ -32,7 +34,7 @@
 
 (defvar *gst-process* nil
   "Holds the GNU Smalltalk process")
-(defvar gst-program-name "@bindir@/gst -V"
+(defvar gst-program-name "gst -V"
   "GNU Smalltalk command to run.  Do not use the -a, -f or -- options.")
 
 (defvar smalltalk-command-string nil
@@ -63,6 +65,7 @@
     keymap)
   "Keymap used in Smalltalk interactor mode.")
 
+;;;###autoload
 (defun gst (command-line)
   "Invoke GNU Smalltalk"
   (interactive (list (if (null current-prefix-arg)
diff --git a/smalltalk-mode-init.el.in b/smalltalk-mode-init.el.in
deleted file mode 100644
index a2dbef9..0000000
--- a/smalltalk-mode-init.el.in
+++ /dev/null
@@ -1,19 +0,0 @@
-;; Autoload file for smalltalk-mode
-
-;; duplicate zip files' setup for star files or fall back on
-;; archive-mode, which scans file contents to determine type so is
-;; safe to use
-(push (cons "\\.star\\'"
-           (catch 'archive-mode
-             (dolist (mode-assoc auto-mode-alist 'archive-mode)
-               (and (string-match (car mode-assoc) "Starfile.zip")
-                    (functionp (cdr mode-assoc))
-                    (throw 'archive-mode (cdr mode-assoc))))))
-      auto-mode-alist)
-
-(if (boundp 'inhibit-local-variables-regexps)
-    (push "\\.star\\'" inhibit-local-variables-regexps)
-    (push "\\.star\\'" inhibit-first-line-modes-regexp))
-
address@hidden@(autoload 'gst "@lispdir@/gst-mode.elc" "" t)
-
diff --git a/smalltalk-mode.el b/smalltalk-mode.el
index 6eb3b56..56d08ce 100644
--- a/smalltalk-mode.el
+++ b/smalltalk-mode.el
@@ -1,15 +1,15 @@
 ;;; smalltalk-mode.el --- Major mode for the Smalltalk programming language
 
 ;; Author: Steve Byrne
+;; Maintainer: Derek Zhou <address@hidden>
 ;; Version: 3.2.92
-;; Copyright 1988-92, 1994-95, 1999, 2000, 2003, 2007, 2008, 2009
-;; Free Software Foundation, Inc.
+;; Copyright 1988-2019  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Smalltalk.
 
 ;; GNU Smalltalk is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by the Free
-;; Software Foundation; either version 2, or (at your option) any later
+;; Software Foundation; either version 3, or (at your option) any later
 ;; version.
 
 ;; GNU Smalltalk is distributed in the hope that it will be useful, but
@@ -231,6 +231,28 @@ Commands:
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.st\\'" . smalltalk-mode))
 
+;; GNU Smalltalk apparently uses files with extension `.star' which use
+;; the zip format.
+;; Duplicate zip files' setup for those .star files or fall back on
+;; archive-mode, which scans file contents to determine type so is
+;; safe to use.
+;;;###autoload
+(add-to-list
+ 'auto-mode-alist
+ (cons "\\.star\\'"
+       (catch 'archive-mode
+        (dolist (mode-assoc auto-mode-alist 'archive-mode)
+          (and (string-match (car mode-assoc) "Starfile.zip")
+               (functionp (cdr mode-assoc))
+               (throw 'archive-mode (cdr mode-assoc)))))))
+
+;;;###autoload
+(add-to-list (if (boundp 'inhibit-local-variables-regexps)
+                 'inhibit-local-variables-regexps
+               'inhibit-first-line-modes-regexp)
+             "\\.star\\'")
+
+
 (defun smalltalk-tab ()
   (interactive)
   (let (col)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]