From: Roland McGrath Date: Wed, 21 Feb 1996 07:29:19 +0000 (+0000) Subject: Added provide. X-Git-Tag: emacs-19.34~1254 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f95f9d2b3302315423081bfbafd93231c3179b1c;p=emacs.git Added provide. --- diff --git a/lisp/progmodes/c-mode.el b/lisp/progmodes/c-mode.el index 22d598b0786..f3364457e18 100644 --- a/lisp/progmodes/c-mode.el +++ b/lisp/progmodes/c-mode.el @@ -183,22 +183,22 @@ regardless of where in the line point is when the TAB command is used.") ;; This is actually the expression for C++ mode, but it's used for C too. (defvar c-imenu-generic-expression - (` + (` ((nil - (, + (, (concat "^" ; beginning of line is required "\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>" "\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; type specs; there can be no "\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; more than 3 tokens, right? - + "\\(" ; last type spec including */& "[a-zA-Z0-9_:]+" "\\([ \t]*[*&]+[ \t]*\\|[ \t]+\\)" ; either pointer/ref sign or whitespace "\\)?" ; if there is a last type spec "\\(" ; name; take that into the imenu entry "[a-zA-Z0-9_:~]+" ; member function, ctor or dtor... - ; (may not contain * because then + ; (may not contain * because then ; "a::operator char*" would become "char*"!) "\\|" "\\([a-zA-Z0-9_:~]*::\\)?operator" @@ -209,10 +209,10 @@ regardless of where in the line point is when the TAB command is used.") ; catch cases with () inside the parentheses ; surrounding the parameters ; (like "int foo(int a=bar()) {...}" - - )) 6) - ("Class" - (, (concat + + )) 6) + ("Class" + (, (concat "^" ; beginning of line is required "\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>" "class[ \t]+" @@ -223,20 +223,20 @@ regardless of where in the line point is when the TAB command is used.") ;; Uncomment if you want to find these too. It will be a bit slower gathering ;; the indexes. ; ("Prototypes" -; (, +; (, ; (concat ; "^" ; beginning of line is required ; "\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>" ; "\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; type specs; there can be no ; "\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; more than 3 tokens, right? - + ; "\\(" ; last type spec including */& ; "[a-zA-Z0-9_:]+" ; "\\([ \t]*[*&]+[ \t]*\\|[ \t]+\\)" ; either pointer/ref sign or whitespace ; "\\)?" ; if there is a last type spec ; "\\(" ; name; take that into the imenu entry ; "[a-zA-Z0-9_:~]+" ; member function, ctor or dtor... -; ; (may not contain * because then +; ; (may not contain * because then ; ; "a::operator char*" would become "char*"!) ; "\\|" ; "\\([a-zA-Z0-9_:~]*::\\)?operator" @@ -246,8 +246,8 @@ regardless of where in the line point is when the TAB command is used.") ; ; the (...) Can't ; ; catch cases with () inside the parentheses ; ; surrounding the parameters -; ; (like "int foo(int a=bar());" -; )) 6) +; ; (like "int foo(int a=bar());" +; )) 6) ; ("Struct" ; (, (concat ; "^" ; beginning of line is required @@ -420,7 +420,7 @@ preserving the comment indentation or line-starting decorations." (paragraph-start ;; Lines containing just a comment start or just an end ;; should not be filled into paragraphs they are next to. - (concat + (concat paragraph-start "\\|[ \t]*/\\*[ \t]*$\\|[ \t]*\\*/[ \t]*$\\|[ \t/*]*$")) (paragraph-separate @@ -531,7 +531,7 @@ preserving the comment indentation or line-starting decorations." (paragraph-start ;; Lines containing just a comment start or just an end ;; should not be filled into paragraphs they are next to. - (concat + (concat paragraph-start "\\|[ \t]*/\\*[ \t]*$\\|[ \t]*\\*/[ \t]*$\\|[ \t/*]*$")) (paragraph-separate @@ -549,8 +549,8 @@ preserving the comment indentation or line-starting decorations." (if comment-start-place (goto-char comment-start-place) (search-backward "/*")) - ;; Protect text before the comment start - ;; by excluding it. Add spaces to bring back + ;; Protect text before the comment start + ;; by excluding it. Add spaces to bring back ;; proper indentation of that point. (let ((column (current-column))) (prog1 (point) @@ -971,7 +971,7 @@ Returns nil if line starts inside a string, t if in a comment." ;; The first following code counts ;; if it is before the line we want to indent. (and (< (point) indent-point) - (- + (- (if (> colon-line-end (point)) (- (current-indentation) c-label-offset) (current-column)) @@ -1174,7 +1174,7 @@ If within a string or comment, move by sentences instead of statements." (not (re-search-forward "[;{}]" end t))))))) (re-search-backward "[;}]") (forward-char 1)) - (error + (error (let ((beg (point))) (backward-up-list -1) (let ((end (point))) @@ -1511,7 +1511,7 @@ Available styles are GNU, K&R, BSD and Whitesmith." With no argument, inserts backslashes and aligns existing backslashes. With an argument, deletes the backslashes. -This function does not modify the last line of the region if the region ends +This function does not modify the last line of the region if the region ends right at the start of the following line; it does not modify blank lines at the start of the region. So you can put the region around an entire macro definition and conveniently use this command." @@ -1644,5 +1644,7 @@ move backward across a preprocessor conditional." (setq count (+ count increment)))) (push-mark) (goto-char new))) + +(provide 'c-mode) ;;; c-mode.el ends here