Changeset 4079 for trunk/lisp/progmodes/idlwave.el

Timestamp:

05/13/06 11:31:18 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/progmodes/idlwave.el (modified) (11 diffs)

trunk/lisp/progmodes/idlwave.el

@@ -1209 +1209 @@
-       ;; fontification.  Slow, use it only in fancy fontification.
-       (keyword-parameters
-\(\n[ \t]*;.*\\)*\n
-5
+n\\([ \t]*\\(;.*\\)?\n\\)*
+6
-
-       ;; System variables start with a bang.
@@ -1916 +1916 @@
-  (set (make-local-variable 'comment-start-skip) ";+[ \t]*")
-  (set (make-local-variable 'comment-start) ";")
+  (set (make-local-variable 'comment-add) 1) ; ";;" for new and regions
-  (set (make-local-variable 'require-final-newline) t)
-  (set (make-local-variable 'abbrev-all-caps) t)
@@ -1948 +1949 @@
-  ;; on the `idlwave-mode' symbol.
-  (set (make-local-variable 'font-lock-defaults) idlwave-font-lock-defaults)
+  (set (make-local-variable 'font-lock-mark-block-function)
+       'idlwave-mark-subprogram)
+  (set (make-local-variable 'font-lock-fontify-region-function)
+       'idlwave-font-lock-fontify-region)
-
-  ;; Imenu setup
@@ -1956 +1961 @@
-  (set (make-local-variable 'imenu-prev-index-position-function)
-       'idlwave-prev-index-position)
+
+  ;; HideShow setup
+  (add-to-list 'hs-special-modes-alist
+               (list 'idlwave-mode
+                     idlwave-begin-block-reg
+                     idlwave-end-block-reg
+                     ";"
+                     'idlwave-forward-block nil))
+  
-
-  ;; Make a local post-command-hook and add our hook to it
@@ -2001 +2015 @@
-    (setq idlwave-setup-done t)))
-
+(defun idlwave-font-lock-fontify-region (beg end &optional verbose)
+  "Fontify continuation lines correctly."
+  (let (pos)
+    (save-excursion
+      (goto-char beg)
+      (forward-line -1)
+      (when (setq pos (idlwave-is-continuation-line))
+        (goto-char pos)
+        (idlwave-beginning-of-statement)
+        (setq beg (point)))))
+  (font-lock-default-fontify-region beg end verbose))
+
-;;
-;; Code Formatting ----------------------------------------------------
-;; 
-
-(defun idlwave-push-mark (&rest rest)
-  "Push mark for compatibility with Emacs 18/19."
-  (if (fboundp 'iconify-frame)
-      (apply 'push-mark rest)
-    (push-mark)))
-
-(defun idlwave-hard-tab ()
@@ -2404 +2424 @@
-  (let ((end (point)))
-    (idlwave-beginning-of-statement)
-idlwave-
+
-
-(defun idlwave-mark-block ()
@@ -2415 +2435 @@
-    (idlwave-backward-block)
-    (idlwave-beginning-of-statement)
-idlwave-
+
-
-
@@ -2426 +2446 @@
-  (let ((beg (point)))
-    (idlwave-forward-block)
-idlwave-
+
-  (exchange-point-and-mark))
-
@@ -2447 +2467 @@
-  (backward-word 1))
-
-
+&optional arg
-  "Move across next nested block."
-  (interactive)
-
-
+
+
+
-
-(defun idlwave-backward-block ()
@@ -2497 +2518 @@
-              (progn
-                (forward-line 1)
-idlwave-
+
-                (message "Could not find end of doc library header.")))
-          (message "Could not find doc library header start.")
-          (goto-char here)))))
-
-
-(defun idlwave-current-routine ()
@@ -3195 +3215 @@
-Blank or comment-only lines following regular continuation lines (with
-`$') count as continuations too."
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-(defun idlwave-is-comment-line ()