Mercurial > emacs

comparison lisp/progmodes/cc-styles.el @ 92148:f991f10f15ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1074
author Miles Bader <miles@gnu.org>
date Sun, 24 Feb 2008 10:09:07 +0000
parents a31afa284500 20a6490b2f90
children 1e3a407766b9
comparison
equal deleted inserted replaced
92147:773ae07da318 92148:f991f10f15ec
421 421
422 (defvar c-read-offset-history nil) 422 (defvar c-read-offset-history 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)))))
430 (symname (symbol-name langelem)) 430 (symname (symbol-name langelem))
431 (defstr (format "(default %s): " oldoff)) 431 (defstr (format "(default %s): " oldoff))
553 (setq c-string-par-separate 553 (setq c-string-par-separate
554 ;;(concat "\\(" (default-value 'paragraph-separate) "\\)\\|[ \t]*\\\\$")) 554 ;;(concat "\\(" (default-value 'paragraph-separate) "\\)\\|[ \t]*\\\\$"))
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
562 562
563 ;; Helper for setting up Filladapt mode. It's not used by CC Mode itself. 563 ;; Helper for setting up Filladapt mode. It's not used by CC Mode itself.