aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-02-05 14:24:26 +0000
committerJuanma Barranquero2008-02-05 14:24:26 +0000
commitcb5bf6ba22c51521d497d601806e4afd9e948902 (patch)
tree62c283b39b9082b06eed7e346d8e6a52a75dc7b0
parent4f9c00e2dc1e780ba79554fa8620cf875e196d19 (diff)
downloademacs-cb5bf6ba22c51521d497d601806e4afd9e948902.tar.gz
emacs-cb5bf6ba22c51521d497d601806e4afd9e948902.zip
*** empty log message ***
-rw-r--r--lisp/mh-e/mh-e.el4
-rw-r--r--lisp/mh-e/mh-xface.el4
-rw-r--r--lisp/progmodes/cc-awk.el2
-rw-r--r--lisp/progmodes/cc-defs.el2
-rw-r--r--lisp/progmodes/cc-styles.el4
-rw-r--r--lisp/progmodes/cperl-mode.el24
6 files changed, 20 insertions, 20 deletions
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 5186b1b2791..67dd6d2d68a 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -1986,7 +1986,7 @@ you would use \"(mh-set-cmd-note 4)\"."
1986 :package-version '(MH-E . "7.0")) 1986 :package-version '(MH-E . "7.0"))
1987 1987
1988(defun mh-scan-format-file-check (symbol value) 1988(defun mh-scan-format-file-check (symbol value)
1989 "Check if desired setting is legal. 1989 "Check if desired setting is valid.
1990Throw an error if user tries to set `mh-scan-format-file' to 1990Throw an error if user tries to set `mh-scan-format-file' to
1991anything but t when `mh-adaptive-cmd-note-flag' is on. Otherwise, 1991anything but t when `mh-adaptive-cmd-note-flag' is on. Otherwise,
1992set SYMBOL to VALUE." 1992set SYMBOL to VALUE."
@@ -2025,7 +2025,7 @@ Emacs start with 0)."
2025 :package-version '(MH-E . "6.0")) 2025 :package-version '(MH-E . "6.0"))
2026 2026
2027(defun mh-adaptive-cmd-note-flag-check (symbol value) 2027(defun mh-adaptive-cmd-note-flag-check (symbol value)
2028 "Check if desired setting is legal. 2028 "Check if desired setting is valid.
2029Throw an error if user tries to turn on 2029Throw an error if user tries to turn on
2030`mh-adaptive-cmd-note-flag' when `mh-scan-format-file' isn't t. 2030`mh-adaptive-cmd-note-flag' when `mh-scan-format-file' isn't t.
2031Otherwise, set SYMBOL to VALUE." 2031Otherwise, set SYMBOL to VALUE."
diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el
index 6b0dc863c1f..e160c6e5875 100644
--- a/lisp/mh-e/mh-xface.el
+++ b/lisp/mh-e/mh-xface.el
@@ -360,8 +360,8 @@ This is only done if `mh-x-image-cache-directory' is nil."
360 "Canonicalize URL. 360 "Canonicalize URL.
361Replace the ?/ character with a ?! character and append .png. 361Replace the ?/ character with a ?! character and append .png.
362Also replaces special characters with `mh-url-hexify-string' 362Also replaces special characters with `mh-url-hexify-string'
363since not all characters, such as :, are legal within Windows 363since not all characters, such as :, are valid within Windows
364filenames. In addition, replaces * with %2a. See URL 364filenames. In addition, replaces * with %2a. See URL
365`http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/ifaces/iitemnamelimits/GetValidCharacters.asp'." 365`http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/ifaces/iitemnamelimits/GetValidCharacters.asp'."
366 (format "%s/%s.png" mh-x-image-cache-directory 366 (format "%s/%s.png" mh-x-image-cache-directory
367 (mh-replace-regexp-in-string 367 (mh-replace-regexp-in-string
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index b361585422a..de15d959cbd 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -213,7 +213,7 @@
213 "\\([{}@` \t]\\|\\+\\+\\|--\\|\\\\.\\)") 213 "\\([{}@` \t]\\|\\+\\+\\|--\\|\\\\.\\)")
214;; A "neutral" char(pair). Doesn't change the "state" of a subsequent /. 214;; A "neutral" char(pair). Doesn't change the "state" of a subsequent /.
215;; This is space/tab, braces, an auto-increment/decrement operator or an 215;; This is space/tab, braces, an auto-increment/decrement operator or an
216;; escaped character. Or one of the (illegal) characters @ or `. But NOT an 216;; escaped character. Or one of the (invalid) characters @ or `. But NOT an
217;; end of line (even if escaped). 217;; end of line (even if escaped).
218(defconst c-awk-neutrals*-re 218(defconst c-awk-neutrals*-re
219 (concat "\\(" c-awk-neutral-re "\\)*")) 219 (concat "\\(" c-awk-neutral-re "\\)*"))
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index d7be903d357..b509fdd7cc2 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -721,7 +721,7 @@ be after it."
721 ((bobp) (setq pos (point-min))) 721 ((bobp) (setq pos (point-min)))
722 ((not pos) 722 ((not pos)
723 (let ((distance (skip-chars-backward "^{"))) 723 (let ((distance (skip-chars-backward "^{")))
724 ;; unbalanced parenthesis, while illegal C code, 724 ;; unbalanced parenthesis, while invalid C code,
725 ;; shouldn't cause an infloop! See unbal.c 725 ;; shouldn't cause an infloop! See unbal.c
726 (when (zerop distance) 726 (when (zerop distance)
727 ;; Punt! 727 ;; Punt!
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index 02240400b1e..72bc86b6cc1 100644
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -423,7 +423,7 @@ STYLE using `c-set-style' if the optional SET-P flag is non-nil."
423 423
424(defun c-read-offset (langelem) 424(defun c-read-offset (langelem)
425 ;; read new offset value for LANGELEM from minibuffer. return a 425 ;; read new offset value for LANGELEM from minibuffer. return a
426 ;; legal value only 426 ;; valid value only
427 (let* ((oldoff (cdr-safe (or (assq langelem c-offsets-alist) 427 (let* ((oldoff (cdr-safe (or (assq langelem c-offsets-alist)
428 (assq langelem (get 'c-offsets-alist 428 (assq langelem (get 'c-offsets-alist
429 'c-stylevar-fallback))))) 429 'c-stylevar-fallback)))))
@@ -555,7 +555,7 @@ variables."
555 "[ \t\f]*\\\\?$") 555 "[ \t\f]*\\\\?$")
556 (setq c-sentence-end-with-esc-eol 556 (setq c-sentence-end-with-esc-eol
557 (concat "\\(\\(" (c-default-value-sentence-end) "\\)" 557 (concat "\\(\\(" (c-default-value-sentence-end) "\\)"
558 ;; N.B.: "$" would be illegal when not enclosed like "\\($\\)". 558 ;; N.B.: "$" would be invalid when not enclosed like "\\($\\)".
559 "\\|" "[.?!][]\"')}]* ?\\\\\\($\\)[ \t\n]*" 559 "\\|" "[.?!][]\"')}]* ?\\\\\\($\\)[ \t\n]*"
560 "\\)"))) 560 "\\)")))
561 561
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index bb45f74dea1..f2fbc1207fc 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1250,7 +1250,7 @@ versions of Emacs."
1250 ["Contract groups" cperl-contract-levels 1250 ["Contract groups" cperl-contract-levels
1251 cperl-use-syntax-table-text-property] 1251 cperl-use-syntax-table-text-property]
1252 "----" 1252 "----"
1253 ["Find next interpolated" cperl-next-interpolated-REx 1253 ["Find next interpolated" cperl-next-interpolated-REx
1254 (next-single-property-change (point-min) 'REx-interpolated)] 1254 (next-single-property-change (point-min) 'REx-interpolated)]
1255 ["Find next interpolated (no //o)" 1255 ["Find next interpolated (no //o)"
1256 cperl-next-interpolated-REx-0 1256 cperl-next-interpolated-REx-0
@@ -2845,7 +2845,7 @@ Will not look before LIM."
2845 (skip-chars-backward " \t") 2845 (skip-chars-backward " \t")
2846 (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:"))) 2846 (looking-at "[ \t]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:")))
2847 (get-text-property (point) 'first-format-line))) 2847 (get-text-property (point) 'first-format-line)))
2848 2848
2849 ;; Look at previous line that's at column 0 2849 ;; Look at previous line that's at column 0
2850 ;; to determine whether we are in top-level decls 2850 ;; to determine whether we are in top-level decls
2851 ;; or function's arg decls. Set basic-indent accordingly. 2851 ;; or function's arg decls. Set basic-indent accordingly.
@@ -3079,7 +3079,7 @@ and closing parentheses and brackets."
3079 ((eq 'toplevel (elt i 0)) ;; [toplevel start char-after state immed-after-block] 3079 ((eq 'toplevel (elt i 0)) ;; [toplevel start char-after state immed-after-block]
3080 (+ (save-excursion ; To beg-of-defun, or end of last sexp 3080 (+ (save-excursion ; To beg-of-defun, or end of last sexp
3081 (goto-char (elt i 1)) ; start = Good place to start parsing 3081 (goto-char (elt i 1)) ; start = Good place to start parsing
3082 (- (current-indentation) ; 3082 (- (current-indentation) ;
3083 (if (elt i 4) cperl-indent-level 0))) ; immed-after-block 3083 (if (elt i 4) cperl-indent-level 0))) ; immed-after-block
3084 (if (eq (elt i 2) ?{) cperl-continued-brace-offset 0) ; char-after 3084 (if (eq (elt i 2) ?{) cperl-continued-brace-offset 0) ; char-after
3085 ;; Look at previous line that's at column 0 3085 ;; Look at previous line that's at column 0
@@ -3899,7 +3899,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
3899 ;;; XXX What to do: foo <<bar ??? 3899 ;;; XXX What to do: foo <<bar ???
3900 ;;; XXX Need to support print {a} <<B ??? 3900 ;;; XXX Need to support print {a} <<B ???
3901 (forward-sexp -1) 3901 (forward-sexp -1)
3902 (save-match-data 3902 (save-match-data
3903 ; $foo << b; $f .= <<B; 3903 ; $foo << b; $f .= <<B;
3904 ; ($f+1) << b; a($f) . <<B; 3904 ; ($f+1) << b; a($f) . <<B;
3905 ; foo 1, <<B; $x{a} <<b; 3905 ; foo 1, <<B; $x{a} <<b;
@@ -3931,7 +3931,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
3931 qtag (regexp-quote tag)) 3931 qtag (regexp-quote tag))
3932 (cond (cperl-pod-here-fontify 3932 (cond (cperl-pod-here-fontify
3933 ;; Highlight the starting delimiter 3933 ;; Highlight the starting delimiter
3934 (cperl-postpone-fontification 3934 (cperl-postpone-fontification
3935 b1 e1 'face my-cperl-delimiters-face) 3935 b1 e1 'face my-cperl-delimiters-face)
3936 (cperl-put-do-not-fontify b1 e1 t))) 3936 (cperl-put-do-not-fontify b1 e1 t)))
3937 (forward-line) 3937 (forward-line)
@@ -4291,7 +4291,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
4291;;;m^a[\^b]c^ + m.a[^b]\.c.; 4291;;;m^a[\^b]c^ + m.a[^b]\.c.;
4292 (save-excursion 4292 (save-excursion
4293 (goto-char (1+ b)) 4293 (goto-char (1+ b))
4294 ;; First 4294 ;; First
4295 (cperl-look-at-leading-count is-x-REx e) 4295 (cperl-look-at-leading-count is-x-REx e)
4296 (setq hairy-RE 4296 (setq hairy-RE
4297 (concat 4297 (concat
@@ -4452,7 +4452,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
4452 ;; This is not pretty: the 5.8.7 logic: 4452 ;; This is not pretty: the 5.8.7 logic:
4453 ;; \0numx -> octal (up to total 3 dig) 4453 ;; \0numx -> octal (up to total 3 dig)
4454 ;; \DIGIT -> backref unless \0 4454 ;; \DIGIT -> backref unless \0
4455 ;; \DIGITs -> backref if legal 4455 ;; \DIGITs -> backref if valid
4456 ;; otherwise up to 3 -> octal 4456 ;; otherwise up to 3 -> octal
4457 ;; Do not try to distinguish, we guess 4457 ;; Do not try to distinguish, we guess
4458 ((or (and (memq qtag (append "01234567" nil)) 4458 ((or (and (memq qtag (append "01234567" nil))
@@ -4460,7 +4460,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
4460 "\\=[01234567]?[01234567]?" 4460 "\\=[01234567]?[01234567]?"
4461 (1- e) 'to-end)) 4461 (1- e) 'to-end))
4462 (and (memq qtag (append "89" nil)) 4462 (and (memq qtag (append "89" nil))
4463 (re-search-forward 4463 (re-search-forward
4464 "\\=[0123456789]*" (1- e) 'to-end)) 4464 "\\=[0123456789]*" (1- e) 'to-end))
4465 (and (eq qtag ?x) 4465 (and (eq qtag ?x)
4466 (re-search-forward 4466 (re-search-forward
@@ -4498,7 +4498,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
4498 ;; in m]]: m][\\\]\]] produces [\\]] 4498 ;; in m]]: m][\\\]\]] produces [\\]]
4499;;; POSIX? [:word:] [:^word:] only inside [] 4499;;; POSIX? [:word:] [:^word:] only inside []
4500;;; "\\=\\(\\\\.\\|[^][\\\\]\\|\\[:\\^?\sw+:]\\|\\[[^:]\\)*]") 4500;;; "\\=\\(\\\\.\\|[^][\\\\]\\|\\[:\\^?\sw+:]\\|\\[[^:]\\)*]")
4501 (while 4501 (while
4502 (and argument 4502 (and argument
4503 (re-search-forward 4503 (re-search-forward
4504 (if (eq (char-after b) ?\] ) 4504 (if (eq (char-after b) ?\] )
@@ -5815,7 +5815,7 @@ indentation and initial hashes. Behaves usually outside of comment."
5815 "," 5815 ","
5816 cperl-maybe-white-and-comment-rex 5816 cperl-maybe-white-and-comment-rex
5817 "\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)") 5817 "\\([$@%*]\\([a-zA-Z0-9_:]+\\|[^a-zA-Z0-9_]\\)\\)")
5818 ;; Bug in font-lock: limit is used not only to limit 5818 ;; Bug in font-lock: limit is used not only to limit
5819 ;; searches, but to set the "extend window for 5819 ;; searches, but to set the "extend window for
5820 ;; facification" property. Thus we need to minimize. 5820 ;; facification" property. Thus we need to minimize.
5821 ,(if cperl-font-lock-multiline 5821 ,(if cperl-font-lock-multiline
@@ -6784,7 +6784,7 @@ construct. DONE-TO and STATEPOS indicate changes to internal caches maintained
6784by CPerl." 6784by CPerl."
6785 (interactive "P") 6785 (interactive "P")
6786 (or arg 6786 (or arg
6787 (setq arg (if (eq cperl-syntaxify-by-font-lock 6787 (setq arg (if (eq cperl-syntaxify-by-font-lock
6788 (if backtrace 'backtrace 'message)) 0 1))) 6788 (if backtrace 'backtrace 'message)) 0 1)))
6789 (setq arg (if (> arg 0) (if backtrace 'backtrace 'message) t)) 6789 (setq arg (if (> arg 0) (if backtrace 'backtrace 'message) t))
6790 (setq cperl-syntaxify-by-font-lock arg) 6790 (setq cperl-syntaxify-by-font-lock arg)
@@ -8245,7 +8245,7 @@ We suppose that the regexp is scanned already."
8245(defun cperl-invert-if-unless-modifiers () 8245(defun cperl-invert-if-unless-modifiers ()
8246 "Change `B if A;' into `if (A) {B}' etc if possible. 8246 "Change `B if A;' into `if (A) {B}' etc if possible.
8247\(Unfinished.)" 8247\(Unfinished.)"
8248 (interactive) ; 8248 (interactive) ;
8249 (let (A B pre-B post-B pre-if post-if pre-A post-A if-string 8249 (let (A B pre-B post-B pre-if post-if pre-A post-A if-string
8250 (w-rex "\\<\\(if\\|unless\\|while\\|until\\|for\\|foreach\\)\\>")) 8250 (w-rex "\\<\\(if\\|unless\\|while\\|until\\|for\\|foreach\\)\\>"))
8251 (and (= (char-syntax (preceding-char)) ?w) 8251 (and (= (char-syntax (preceding-char)) ?w)