[elpa] externals/smalltalk-mode 0448eaa 08/34: merge from stephen

[Stefan Monnier]

branch: externals/smalltalk-mode
commit 0448eaa35f719ad7fb369071c29c653289dd5c33
Author: Paolo Bonzini <address@hidden>
Commit: Paolo Bonzini <address@hidden>

    merge from stephen
    
    Patches applied:
    
     * address@hidden/smalltalk--backstage--2.2--patch-43
       Emacs auto-modes for GST files
    
     * address@hidden/smalltalk--backstage--2.2--patch-44
       explain differences between using Dictionary and LookupTable
    
     * address@hidden/smalltalk--backstage--2.2--patch-45
       conditionalize BloxGTK/Blox install
    
    git-archimport-id: address@hidden/smalltalk--devo--2.2--patch-460
---
 smalltalk-mode.el.in | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/smalltalk-mode.el.in b/smalltalk-mode.el.in
index de5d1ac..c96684c 100644
--- a/smalltalk-mode.el.in
+++ b/smalltalk-mode.el.in
@@ -1035,6 +1035,22 @@ Whitespace is defined as spaces, tabs, and comments."
             (skip-chars-forward "^[")
             (smalltalk-end-of-defun))))
 
+;; ---[ Emacs configuration ]-----------------------------------------
+
+;; 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)
+
+(push "\\.star\\'" inhibit-first-line-modes-regexps)
+
+(push '("\\.st\\'" . smalltalk-mode) auto-mode-alist)
 
 (provide 'smalltalk-mode)
 (autoload 'gst "@lispdir@/gst-mode.elc" "" t)