mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Code Issues Releases Activity

* lisp/emacs-lisp/smie.el (smie-highlight-matching-block): Always turn

Browse Source 
off the highlight first.

* lisp/progmodes/octave.el (octave-indent-comment): Tweak regexps.
(octave-help): Small simplification.

* test/indent/octave.m: Tweak.
This commit is contained in:
Leo Liu 2013-05-29 14:50:48 +08:00
parent bc74a74a5d
commit f236dd8432
5 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/ChangeLog
View File

@ -1,3 +1,11 @@
2013-05-29 Leo Liu <sdl.web@gmail.com>
* progmodes/octave.el (octave-indent-comment): Tweak regexps.
(octave-help): Small simplification.
* emacs-lisp/smie.el (smie-highlight-matching-block): Always turn
off the highlight first.
2013-05-29 Glenn Morris <rgm@gnu.org>
* progmodes/idlwave.el (idlwave-scan-user-lib-files)

15
lisp/emacs-lisp/smie.el
View File

@ -1060,10 +1060,10 @@ This uses SMIE's tables and is expected to be placed on `post-self-insert-hook'.
beg end (current-buffer))
(overlay-put smie--highlight-matching-block-overlay
'face 'smie-matching-block-highlight))))
(save-excursion
(condition-case nil
(if (nth 8 (syntax-ppss))
(overlay-put smie--highlight-matching-block-overlay 'face nil)
(overlay-put smie--highlight-matching-block-overlay 'face nil)
(unless (nth 8 (syntax-ppss))
(save-excursion
(condition-case nil
(let ((token
(or (funcall beg-of-tok)
(funcall beg-of-tok
@ -1082,11 +1082,8 @@ This uses SMIE's tables and is expected to be placed on `post-self-insert-hook'.
(let ((beg (point))
(opener (funcall smie-forward-token-function)))
(when (assoc opener smie-closer-alist)
(funcall highlight beg (point)))))
(t (overlay-put smie--highlight-matching-block-overlay
'face nil)))))
(scan-error
(overlay-put smie--highlight-matching-block-overlay 'face nil)))))))
(funcall highlight beg (point)))))))
(scan-error)))))))
(defvar smie--highlight-matching-block-timer nil)

7
lisp/progmodes/octave.el
View File

@ -446,11 +446,11 @@ Non-nil means always go to the next Octave code line after sending."
(back-to-indentation)
(cond
((octave-in-string-or-comment-p) nil)
((looking-at-p "\\s<\\{3,\\}")
((looking-at-p "\\(\\s<\\)\\1\\{2,\\}")
0)
;; Exclude %{, %} and %!.
((and (looking-at-p "\\s<\\(?:[^{}!]\\|$\\)")
(not (looking-at-p "\\s<\\s<")))
(not (looking-at-p "\\(\\s<\\)\\1")))
(comment-choose-indent)))))
@ -1637,8 +1637,7 @@ if ismember(exist(\"%s\"), [2 3 5 103]) print_usage(\"%s\") endif\n"
;; Make 'See also' clickable
(with-syntax-table octave-mode-syntax-table
(when (re-search-forward "^\\s-*See also:" nil t)
(let ((end (or (save-excursion (re-search-forward "^\\s-*$" nil t))
(point-max))))
(let ((end (save-excursion (re-search-forward "^\\s-*$" nil t))))
(while (re-search-forward "\\_<\\(?:\\sw\\|\\s_\\)+\\_>" end t)
(make-text-button (match-beginning 0)
;; If the match ends with . exclude it.

4
test/ChangeLog
View File

@ -1,3 +1,7 @@
2013-05-29 Leo Liu <sdl.web@gmail.com>
* indent/octave.m: Tweak.
2013-05-26 Aidan Gauland <aidalgol@amuri.net>
* tests/eshell.el: Rewrite tests using ERT.

2
test/indent/octave.m
View File

@ -2311,7 +2311,7 @@ function load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst,
ext(end) = [];
else
isglob = false; # I am a test
# me too
#%% me too
### I shall align to column 0
endif
pos = findstr (nm, ext);