Mercurial > emacs
comparison lisp/progmodes/cc-cmds.el @ 104693:eee42a220506
* progmodes/cc-vars.el (c-comment-continuation-stars):
* progmodes/cc-engine.el (c-looking-at-bos):
* progmodes/cc-cmds.el (c-toggle-auto-state)
(c-forward-into-nomenclature, c-backward-into-nomenclature)
(c-comment-line-break-function): Add version of obsolescence.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sat, 29 Aug 2009 02:07:42 +0000 |
parents | 23b69c963c1d |
children | d6ddd512e29c |
comparison
equal
deleted
inserted
replaced
104692:b99b3dda298b | 104693:eee42a220506 |
---|---|
320 (if c-auto-newline (setq c-electric-flag t)) | 320 (if c-auto-newline (setq c-electric-flag t)) |
321 (c-update-modeline) | 321 (c-update-modeline) |
322 (c-keep-region-active)) | 322 (c-keep-region-active)) |
323 | 323 |
324 (defalias 'c-toggle-auto-state 'c-toggle-auto-newline) | 324 (defalias 'c-toggle-auto-state 'c-toggle-auto-newline) |
325 (make-obsolete 'c-toggle-auto-state 'c-toggle-auto-newline) | 325 (make-obsolete 'c-toggle-auto-state 'c-toggle-auto-newline "22.1") |
326 | 326 |
327 (defun c-toggle-hungry-state (&optional arg) | 327 (defun c-toggle-hungry-state (&optional arg) |
328 "Toggle hungry-delete-key feature. | 328 "Toggle hungry-delete-key feature. |
329 Optional numeric ARG, if supplied, turns on hungry-delete when | 329 Optional numeric ARG, if supplied, turns on hungry-delete when |
330 positive, turns it off when negative, and just toggles it when zero or | 330 positive, turns it off when negative, and just toggles it when zero or |
1328 (defun c-forward-into-nomenclature (&optional arg) | 1328 (defun c-forward-into-nomenclature (&optional arg) |
1329 "Compatibility alias for `c-forward-subword'." | 1329 "Compatibility alias for `c-forward-subword'." |
1330 (interactive "p") | 1330 (interactive "p") |
1331 (require 'cc-subword) | 1331 (require 'cc-subword) |
1332 (c-forward-subword arg)) | 1332 (c-forward-subword arg)) |
1333 (make-obsolete 'c-forward-into-nomenclature 'c-forward-subword) | 1333 (make-obsolete 'c-forward-into-nomenclature 'c-forward-subword "22.1") |
1334 | 1334 |
1335 (defun c-backward-into-nomenclature (&optional arg) | 1335 (defun c-backward-into-nomenclature (&optional arg) |
1336 "Compatibility alias for `c-backward-subword'." | 1336 "Compatibility alias for `c-backward-subword'." |
1337 (interactive "p") | 1337 (interactive "p") |
1338 (require 'cc-subword) | 1338 (require 'cc-subword) |
1339 (c-backward-subword arg)) | 1339 (c-backward-subword arg)) |
1340 (make-obsolete 'c-backward-into-nomenclature 'c-backward-subword) | 1340 (make-obsolete 'c-backward-into-nomenclature 'c-backward-subword "22.1") |
1341 | 1341 |
1342 (defun c-scope-operator () | 1342 (defun c-scope-operator () |
1343 "Insert a double colon scope operator at point. | 1343 "Insert a double colon scope operator at point. |
1344 No indentation or other \"electric\" behavior is performed." | 1344 No indentation or other \"electric\" behavior is performed." |
1345 (interactive "*") | 1345 (interactive "*") |
4429 (current-indentation)))) | 4429 (current-indentation)))) |
4430 (funcall do-line-break) | 4430 (funcall do-line-break) |
4431 (indent-to col)))))) | 4431 (indent-to col)))))) |
4432 | 4432 |
4433 (defalias 'c-comment-line-break-function 'c-indent-new-comment-line) | 4433 (defalias 'c-comment-line-break-function 'c-indent-new-comment-line) |
4434 (make-obsolete 'c-comment-line-break-function 'c-indent-new-comment-line) | 4434 (make-obsolete 'c-comment-line-break-function 'c-indent-new-comment-line "21.1") |
4435 | 4435 |
4436 ;; advice for indent-new-comment-line for older Emacsen | 4436 ;; advice for indent-new-comment-line for older Emacsen |
4437 (unless (boundp 'comment-line-break-function) | 4437 (unless (boundp 'comment-line-break-function) |
4438 (defvar c-inside-line-break-advice nil) | 4438 (defvar c-inside-line-break-advice nil) |
4439 (defadvice indent-new-comment-line (around c-line-break-advice | 4439 (defadvice indent-new-comment-line (around c-line-break-advice |