diff options
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/asm-mode.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cfengine.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 10 | ||||
| -rw-r--r-- | lisp/progmodes/fortran.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/gdb-ui.el | 30 | ||||
| -rw-r--r-- | lisp/progmodes/grep.el | 12 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/sql.el | 2 |
8 files changed, 32 insertions, 32 deletions
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el index 17cb7c78316..968dc1a9e23 100644 --- a/lisp/progmodes/asm-mode.el +++ b/lisp/progmodes/asm-mode.el @@ -186,7 +186,7 @@ Special commands: (delete-horizontal-space) (tab-to-tab-stop)))) -;; Obsolete since Emacs-21.4. +;; Obsolete since Emacs-22.1. (defalias 'asm-newline 'newline-and-indent) (defun asm-comment () diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el index 3f6c24c85c6..a9e86de44aa 100644 --- a/lisp/progmodes/cfengine.el +++ b/lisp/progmodes/cfengine.el @@ -175,7 +175,7 @@ Intended as the value of `indent-line-function'." (if (> (- (point-max) pos) (point)) (goto-char (- (point-max) pos))))) -;; This doesn't work too well in Emacs 21.2. See 21.4 development +;; This doesn't work too well in Emacs 21.2. See 22.1 development ;; code. (defun cfengine-fill-paragraph (&optional justify) "Fill `paragraphs' in Cfengine code." diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 7b401da794e..79a6b4b43be 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -459,7 +459,7 @@ starting the compilation process.") (t (:weight bold))) "Face used to highlight compiler warnings." :group 'font-lock-highlighting-faces - :version "21.4") + :version "22.1") (defface compilation-info-face '((((class color) (min-colors 16) (background light)) @@ -470,7 +470,7 @@ starting the compilation process.") (t (:weight bold))) "Face used to highlight compiler warnings." :group 'font-lock-highlighting-faces - :version "21.4") + :version "22.1") (defvar compilation-message-face nil "Face name to use for whole messages. @@ -1133,7 +1133,7 @@ info, are considered errors." (const :tag "Info" 1) (const :tag "None" 0)) :group 'compilation - :version "21.4") + :version "22.1") (defcustom compilation-skip-visited nil "*Compilation motion commands skip visited messages if this is t. @@ -1142,7 +1142,7 @@ to from the current content in the current compilation buffer, even if it was from a different message." :type 'boolean :group 'compilation - :version "21.4") + :version "22.1") ;;;###autoload (defun compilation-mode (&optional name-of-mode) @@ -1557,7 +1557,7 @@ region and the first line of the next region." If nil, don't scroll the compilation output window." :type '(choice integer (const :tag "No window scrolling" nil)) :group 'compilation - :version "21.4") + :version "22.1") (defsubst compilation-set-window (w mk) "Align the compilation output window W with marker MK near top." diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index 3ded7758b90..768012c736c 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -147,7 +147,7 @@ You might want to change this to \"*\", for instance." "*Regexp to match a directive line. The matching text will be fontified with `font-lock-keyword-face'. The matching line will be given zero indentation." - :version "21.4" + :version "22.1" :type 'regexp :group 'fortran-indent) @@ -952,7 +952,7 @@ Auto-indent does not happen if a numeric ARG is used." fortran-minimum-statement-indent-tab fortran-minimum-statement-indent-fixed) (current-column)) ;; In col 8 with a single tab to the left. - (eq ?\t (char-after (line-beginning-position))) + (eq ?\t (char-after (line-beginning-position))) (not (or (eq last-command 'fortran-indent-line) (eq last-command 'fortran-indent-new-line)))) diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index bdcce671a9c..66740773165 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -59,7 +59,7 @@ ;; of 'info registers'. ;; 3) Use tree-widget.el instead of the speedbar for watch-expressions? ;; 4) Mark breakpoint locations on scroll-bar of source buffer? -;; 5) After release of 21.4 use '-var-list-children --all-values' +;; 5) After release of 22.1 use '-var-list-children --all-values' ;; and '-stack-list-locals 2' which need GDB 6.1 onwards. ;;; Code: @@ -183,13 +183,13 @@ detailed description of this mode. "Non-nil means record the process input and output in `gdb-debug-log'." :type 'boolean :group 'gud - :version "21.4") + :version "22.1") (defcustom gdb-use-inferior-io-buffer nil "Non-nil means display output from the inferior in a separate buffer." :type 'boolean :group 'gud - :version "21.4") + :version "22.1") (defun gdb-ann3 () (setq gdb-debug-log nil) @@ -268,7 +268,7 @@ detailed description of this mode. "If non-nil use FUN::VAR format to display variables in the speedbar." ; :type 'boolean :group 'gud - :version "21.4") + :version "22.1") (defun gud-watch () "Watch expression at point." @@ -441,7 +441,7 @@ detailed description of this mode. The highlighting is done with `font-lock-warning-face'." :type 'boolean :group 'gud - :version "21.4") + :version "22.1") (defun gdb-speedbar-expand-node (text token indent) "Expand the node the user clicked on. @@ -491,7 +491,7 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'." (name (funcall (gdb-rules-name-maker rules))) (new (get-buffer-create name))) (with-current-buffer new - (let ((trigger)) + (let ((trigger)) (if (cdr (cdr rules)) (setq trigger (funcall (car (cdr (cdr rules)))))) (set (make-local-variable 'gdb-buffer-type) key) @@ -691,7 +691,7 @@ This filter may simply queue input for a later time." "Default command to execute an executable under the GDB-UI debugger." :type 'string :group 'gud - :version "21.4") + :version "22.1") (defvar gdb-annotation-rules '(("pre-prompt" gdb-pre-prompt) @@ -789,7 +789,7 @@ not GDB." (setq gud-running t) (if gdb-use-inferior-io-buffer (setq gdb-output-sink 'inferior)))) - (t + (t (gdb-resync) (error "Unexpected `starting' annotation"))))) @@ -1205,7 +1205,7 @@ static char *magick[] = { (with-selected-window (posn-window posn) (save-excursion (goto-char (posn-point posn)) - (if + (if ; (or (posn-object posn) ; (eq (car (fringe-bitmaps-at-pos (posn-point posn))) @@ -1544,7 +1544,7 @@ static char *magick[] = { "Number of data items in memory window." :type 'integer :group 'gud - :version "21.4") + :version "22.1") (defcustom gdb-memory-format "x" "Display format of data items in memory window." @@ -1554,7 +1554,7 @@ static char *magick[] = { (const :tag "Octal" "o") (const :tag "Binary" "t")) :group 'gud - :version "21.4") + :version "22.1") (defcustom gdb-memory-unit "w" "Unit size of data items in memory window." @@ -1563,7 +1563,7 @@ static char *magick[] = { (const :tag "Word" "w") (const :tag "Giant word" "g")) :group 'gud - :version "21.4") + :version "22.1") (gdb-set-buffer-rules 'gdb-memory-buffer 'gdb-memory-buffer-name @@ -1753,7 +1753,7 @@ corresponding to the mode line clicked." (use-local-map gdb-memory-mode-map) (setq header-line-format '(:eval - (concat + (concat "Read address: " (propertize gdb-memory-address 'face font-lock-warning-face @@ -1957,7 +1957,7 @@ corresponding to the mode line clicked." "Nil means don't display source file containing the main routine." :type 'boolean :group 'gud - :version "21.4") + :version "22.1") (defun gdb-set-window-buffer (name) (set-window-buffer (selected-window) (get-buffer name)) @@ -2001,7 +2001,7 @@ of the inferior. Non-nil means display the layout shown for `gdba'." :type 'boolean :group 'gud - :version "21.4") + :version "22.1") (defun gdb-many-windows (arg) "Toggle the number of windows in the basic arrangement." diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index ac052a893b2..ab705212397 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -44,7 +44,7 @@ "*Number of lines in a grep window. If nil, use `compilation-window-height'." :type '(choice (const :tag "Default" nil) integer) - :version "21.4" + :version "22.1" :group 'grep) (defcustom grep-auto-highlight t @@ -61,7 +61,7 @@ will be parsed and highlighted as soon as you try to move to them." :type '(choice (const :tag "All" t) (const :tag "None" nil) (integer :tag "First N lines")) - :version "21.4" + :version "22.1" :group 'grep) (defcustom grep-highlight-matches 'auto-detect @@ -81,7 +81,7 @@ call that function before using this variable in your program." :type '(choice (const :tag "Do not highlight matches with grep markers" nil) (const :tag "Highlight matches with grep markers" t) (other :tag "Not Set" auto-detect)) - :version "21.4" + :version "22.1" :group 'grep) (defcustom grep-scroll-output nil @@ -91,7 +91,7 @@ Setting it causes the grep commands to put point at the end of their output window so that the end of the output is always visible rather than the begining." :type 'boolean - :version "21.4" + :version "22.1" :group 'grep) ;;;###autoload @@ -141,7 +141,7 @@ The following place holders should be present in the string: <R> - the regular expression searched for." :type '(choice string (const :tag "Not Set" nil)) - :version "21.4" + :version "22.1" :group 'grep) (defcustom grep-tree-files-aliases '( @@ -172,7 +172,7 @@ The following place holders should be present in the string: See `compilation-error-screen-columns'" :type '(choice (const :tag "Default" nil) integer) - :version "21.4" + :version "22.1" :group 'grep) ;;;###autoload diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index f73ccdda9eb..745bc57a9b0 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -72,7 +72,7 @@ (defgroup python nil "Silly walks in the Python language" :group 'languages - :version "21.4" + :version "22.1" :link '(emacs-commentary-link "python")) ;;;###autoload diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 0e0d89b07e1..902cd920ead 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -617,7 +617,7 @@ The program can also specify a TCP connection. See `make-comint'." ;; -w is the linesize "*List of additional options for `sql-ms-program'." :type '(repeat string) - :version "21.4" + :version "22.1" :group 'SQL) ;; Customization for Postgres |