diff options
| author | Miles Bader <miles@gnu.org> | 2005-06-30 00:31:46 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-06-30 00:31:46 +0000 |
| commit | eeb88b27e1dbd3f412aa684d44e4a784f6e536a2 (patch) | |
| tree | 23ea1eda87f588e060b6c00e9c7ffac6a89a7e42 /lisp/progmodes/cperl-mode.el | |
| parent | 16e1457021e3f6e3b83fc9b5262fde38b7140c96 (diff) | |
| parent | 84861437f914ac45c1eea7b6477ffc4783bb3bdd (diff) | |
| download | emacs-eeb88b27e1dbd3f412aa684d44e4a784f6e536a2.tar.gz emacs-eeb88b27e1dbd3f412aa684d44e4a784f6e536a2.tar.bz2 emacs-eeb88b27e1dbd3f412aa684d44e4a784f6e536a2.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-67
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 447-458)
- Update from CVS
- Update from CVS: lisp/subr.el (add-to-ordered-list): Doc fix.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 83-85)
- Merge from emacs--cvs-trunk--0
- Update from CVS
Diffstat (limited to 'lisp/progmodes/cperl-mode.el')
| -rw-r--r-- | lisp/progmodes/cperl-mode.el | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index d95c0294c4d..052df4eedda 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1516,7 +1516,8 @@ or as help on variables `cperl-tips', `cperl-problems', (t '((cperl-load-font-lock-keywords cperl-load-font-lock-keywords-1 - cperl-load-font-lock-keywords-2))))) + cperl-load-font-lock-keywords-2) + nil nil ((?_ . "w")))))) (make-local-variable 'cperl-syntax-state) (if cperl-use-syntax-table-text-property (progn @@ -3840,7 +3841,11 @@ the sections using `cperl-pod-head-face', `cperl-pod-face', (and (buffer-modified-p) (not modified) (set-buffer-modified-p nil)) - (set-syntax-table cperl-mode-syntax-table)) + ;; I do not understand what this is doing here. It breaks font-locking + ;; because it resets the syntax-table from font-lock-syntax-table to + ;; cperl-mode-syntax-table. + ;; (set-syntax-table cperl-mode-syntax-table) + ) (car err-l))) (defun cperl-backward-to-noncomment (lim) @@ -4350,7 +4355,7 @@ indentation and initial hashes. Behaves usually outside of comment." fill-column) (let ((c (save-excursion (beginning-of-line) (cperl-to-comment-or-eol) (point))) - (s (memq (following-char) '(?\ ?\t))) marker) + (s (memq (following-char) '(?\s ?\t))) marker) (if (>= c (point)) ;; Don't break line inside code: only inside comment. nil @@ -4361,11 +4366,11 @@ indentation and initial hashes. Behaves usually outside of comment." (if (bolp) (progn (re-search-forward "#+[ \t]*") (goto-char (match-end 0)))) ;; Following space could have gone: - (if (or (not s) (memq (following-char) '(?\ ?\t))) nil + (if (or (not s) (memq (following-char) '(?\s ?\t))) nil (insert " ") (backward-char 1)) ;; Previous space could have gone: - (or (memq (preceding-char) '(?\ ?\t)) (insert " ")))))) + (or (memq (preceding-char) '(?\s ?\t)) (insert " ")))))) (defun cperl-imenu-addback (lst &optional isback name) ;; We suppose that the lst is a DAG, unless the first element only |