Changeset eebb93b in git

Timestamp:

Dec 6, 1999, 7:36:37 PM (24 years ago)

Author:

Tim Wichmann <wichmann@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

772c6006e5f2992e642422ea0fb91ddb98106303

Parents:

c34e3dd63c952cffb9e1aa1402c32cbdc0bf3bbb

Message:

1999-12-06  T. Wichmann  <wichmann@arboretum.itwm.uni-kl.de>

	* singular.el (singular-internal): Removed bug: Adding of trailing
	slash crashed if directory was nil
	(singular-completion-do): Added completion of examples


git-svn-id: file:///usr/local/Singular/svn/trunk@3964 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• emacs/singular.el (modified) (9 diffs)

emacs/singular.el

@@ -1 +1 @@
 ;;; singular.el --- Emacs support for Computer Algebra System Singular
 
-;; $Id: singular.el,v 1.52 1999-12-06 16:07:00 obachman Exp $
+;; $Id: singular.el,v 1.53 1999-12-06 18:36:37 wichmann Exp $
 
 ;;; Commentary:
@@ -2649 +2649 @@
   "Load Singular completion and libraries files.
 Assumes that `singular-emacs-home-directory' is set to the appropriate
-value and loads the files \"cmd-cmpl.el\", \"hlp-cmpl.el\", and
-\"lib-cmpl.el\".
+value and loads the files \"cmd-cmpl.el\", \"hlp-cmpl.el\", \"ex-cmpl.el\",
+and \"lib-cmpl.el\".
 On success calls `singular-menu-install-libraries'."
   (or (load (singular-expand-emacs-file-name "cmd-cmpl.el" t) t t t)
@@ -2656 +2656 @@
   (or (load (singular-expand-emacs-file-name "hlp-cmpl.el" t) t t t)
       (message "Can't find help topic completion file! Help completion disabled."))
+  (or (load (singular-expand-emacs-file-name "ex-cmpl.el" t) t t t)
+      (message "Can't find examples completion file! Examples completion disabled."))
   (if (load (singular-expand-emacs-file-name "lib-cmpl.el" t) t t t)
       (singular-menu-install-libraries)
@@ -2785 +2787 @@
 (defun singular-completion-init ()
   "Initialize completion for Singular interactive mode.
-Initializes completion of file names, commands and help topics.
+Initializes completion of file names, commands, examples, and help topics.
 
 This function is called by `singular-exec'."
   (singular-debug 'interactive (message "Initializing completion"))
   (set (make-local-variable 'singular-commands-alist) nil)
+  (set (make-local-variable 'singular-examples-alist) nil)
   (set (make-local-variable 'singular-help-topics-alist) nil))
 
@@ -2818 +2821 @@
 Performs completion of Singular help topics if point is at the end of a 
 help command (\"help\" or \"?\").
+Performs completion of Singular examples if point is at the end of an
+example command (\"example\").
 Otherwise performs completion of Singular commands."
   (interactive)
@@ -2829 +2834 @@
     ;; else: expand command or help
     (let ((end (point))
+          (post-prompt (save-excursion
+                         (beginning-of-line)
+                         (singular-prompt-skip-forward)))
           beg)
-      (if (save-excursion
-            (beginning-of-line)
-            (singular-prompt-skip-forward)
-            (looking-at "[ \t]*\\([\\?]\\|help \\)[ \t]*\\(.*\\)"))
-          ;; then: help completion
-          (if singular-help-topics-alist
-              (singular-completion-do (match-string 2) (match-beginning 2)
-                                      end singular-help-topics-alist)
-            (message "Completion of Singular help topics disabled.")
-            (ding))
+      (cond
+       ((save-excursion
+          (goto-char post-prompt)
+          (looking-at "[ \t]*\\([\\?]\\|help \\)[ \t]*\\(.*\\)"))
+        ;; then: help completion
+        (if singular-help-topics-alist
+            (singular-completion-do (match-string 2) (match-beginning 2)
+                                    end singular-help-topics-alist)
+          (message "Completion of Singular help topics disabled.")
+          (ding)))
+       ((save-excursion
+          (goto-char post-prompt)
+          (looking-at "[ \t]*\\(example \\)[ \t]*\\(.*\\)"))
+        ;; then: example completion
+        (if singular-help-topics-alist
+            (singular-completion-do (match-string 2) (match-beginning 2)
+                                    end singular-examples-alist)
+          (message "Completion of Singular help topics disabled.")
+          (ding)))
+       (t
         ;; else: command completion
         (save-excursion
@@ -2848 +2866 @@
                                     end singular-commands-alist)
           (message "Completion of Singular commands disabled.")
-          (ding))))))
+          (ding)))))))
 ;;}}}
 
@@ -3871 +3889 @@
   "Interrupt the Singular process running in the current buffer.
 If called interactiveley, asks whether to (a)bort the current Singular
-command, (q)uit or (r) restart the current Singular process, 
-or (c)ontinue without doing anything (default).
+command, (q)uit or (r) restart the current Singular process, or (c)ontinue
+without doing anything (default).
 
 If called non-interactiveley, MODE should be one of 'abort, 'quit, 'restart,
@@ -3979 +3997 @@
          (buffer (get-buffer buffer-name)))
     
-    ;; make sure directory contains a "/" at the end
-    (setq directory 
-      (concat directory
-              ;; we check for trailing slash and backslash
-              ;; but unconditionally insert a slash.
-              ;; Hopefully that works on NT, too.
-              (if (memq (aref directory
-                              (1- (length directory)))
-                        '(?/ ?\\))
-                  "" "/")))
+    ;; If directory is set, make sure that it ends in a "/" at the end.
+    ;; The check is done on both slash and backslash, but we unconditionally
+    ;; insert a slash. Hopefully that works on NT, too.
+    (and directory
+         (memq (aref directory (1- (length directory))) '(?/ ?\\))
+         (setq directory (concat directory "/")))
     
     (if (not buffer)