diff options
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/autoconf.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-fonts.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/glasses.el | 3 | ||||
| -rw-r--r-- | lisp/progmodes/gud.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/idlw-help.el | 5 | ||||
| -rw-r--r-- | lisp/progmodes/idlwave.el | 10 | ||||
| -rw-r--r-- | lisp/progmodes/ld-script.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/simula.el | 2 |
10 files changed, 18 insertions, 18 deletions
diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el index fe021d04cea..08a849b16bc 100644 --- a/lisp/progmodes/autoconf.el +++ b/lisp/progmodes/autoconf.el @@ -1,6 +1,6 @@ ;;; autoconf.el --- mode for editing Autoconf configure.in files -;; Copyright (C) 2000, 2001, 2002 2003, 2004, 2005, 2006 +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index 8473eee90a2..ab31fa877f7 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1179,7 +1179,7 @@ casts and declarations are fontified. Used on level 2 and higher." ;; The below code attempts to fontify the case constants in ;; c-label-face-name, but it cannot catch every case [sic]. ;; And do we want to fontify case constants anyway? - nil + (c-forward-label t match-pos nil) ;;; (when (c-forward-label t match-pos nil) ;;; ;; Can't use `c-fontify-types-and-refs' here since we ;;; ;; should use the label face. diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 73ea6de9b05..bd9af00d9c6 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -1331,7 +1331,7 @@ properly." (c-lang-defconst c-at-vsemi-p-fn "Contains a function \"Is there a virtual semicolon at POS or point?\". Such a function takes one optional parameter, a buffer position (defaults to -point), and returns NIL or t. This variable contains NIL for languages which +point), and returns nil or t. This variable contains nil for languages which don't have EOL terminated statements. " t nil awk 'c-awk-at-vsemi-p) @@ -1342,7 +1342,7 @@ don't have EOL terminated statements. " The (admittedly kludgey) purpose of such a function is to prevent an infinite recursion in c-beginning-of-statement-1 when point starts at a `while' token. The function MUST NOT UNDER ANY CIRCUMSTANCES call c-beginning-of-statement-1, -even indirectly. This variable contains NIL for languages which don't have +even indirectly. This variable contains nil for languages which don't have EOL terminated statements." t nil awk 'c-awk-vsemi-status-unknown-p) diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el index 90e6fbe3df3..50d01e9d2e5 100644 --- a/lisp/progmodes/glasses.el +++ b/lisp/progmodes/glasses.el @@ -1,6 +1,7 @@ ;;; glasses.el --- make cantReadThis readable -;; Copyright (C) 1999, 2000, 2001, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Milan Zamazal <pdm@zamazal.org> ;; Maintainer: Milan Zamazal <pdm@zamazal.org> diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index fc7c303c491..adc6cd5194d 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -486,7 +486,7 @@ required by the caller." (car (nth 1 var-list)))) (setq char ?-) (setq char ?+)) - (if (string-match "\\*$" type) + (if (string-match "\\*$\\|\\*&$" type) (speedbar-make-tag-line 'bracket char 'gdb-speedbar-expand-node varnum diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 1d370244523..9b812809352 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -1,7 +1,6 @@ ;;; idlw-help.el --- HTML Help code for IDLWAVE -;; Copyright (c) 2000 Carsten Dominik -;; Copyright (c) 2001, 2002 J.D. Smith -;; Copyright (c) 2003,2004,2005,2006 Free Software Foundation +;; Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation ;; ;; Authors: J.D. Smith <jdsmith@as.arizona.edu> ;; Carsten Dominik <dominik@science.uva.nl> diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index f33ae35ed30..25f05b54b74 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -427,11 +427,11 @@ t means to show all source files." :type 'integer) (defcustom idlwave-library-path nil - "Library path for Windows and MacOS (OS9). Not needed under Unix. + "Library path for Windows and MacOS (OS9). Not needed under UNIX. When selecting the directories to scan for IDL user catalog routine info, IDLWAVE can, under UNIX, query the shell for the exact search path \(the value of !PATH). However, under Windows and MacOS -(pre-OSX), the IDLWAVE shell does not work. In this case, this +\(pre-OSX), the IDLWAVE shell does not work. In this case, this variable can be set to specify the paths where IDLWAVE can find PRO files. The shell will only be asked for a list of paths when this variable is nil. The value is a list of directories. A directory @@ -1595,7 +1595,7 @@ Capitalize system variables - action only (define-key idlwave-mode-map "\C-c\C-t" 'idlwave-find-module-this-file) (define-key idlwave-mode-map "\C-c?" 'idlwave-routine-info) (define-key idlwave-mode-map "\M-?" 'idlwave-context-help) -(define-key idlwave-mode-map [(control meta ?\?)] +(define-key idlwave-mode-map [(control meta ?\?)] 'idlwave-help-assistant-help-with-topic) ;; Pickup both forms of Esc/Meta binding (define-key idlwave-mode-map [(meta tab)] 'idlwave-complete) @@ -1942,7 +1942,7 @@ The main features of this mode are (set (make-local-variable 'parse-sexp-ignore-comments) t) ;; ChangeLog - (set (make-local-variable 'add-log-current-defun-function) + (set (make-local-variable 'add-log-current-defun-function) 'idlwave-current-routine-fullname) ;; Set tag table list to use IDLTAGS as file name. @@ -9236,7 +9236,7 @@ Assumes that point is at the beginning of the unit as found by "--" ["Info" idlwave-info t] "--" - ["Help with Topic" idlwave-help-assistant-help-with-topic + ["Help with Topic" idlwave-help-assistant-help-with-topic idlwave-help-use-assistant] ["Launch IDL Help" idlwave-launch-idlhelp t]))) diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el index 4f0159c5992..461c8b9bcf1 100644 --- a/lisp/progmodes/ld-script.el +++ b/lisp/progmodes/ld-script.el @@ -89,7 +89,7 @@ ;; 3.5.2 PROVIDE "PROVIDE" ;; 3.5.3 PROVIDE_HIDDEN - "PROVIDE_HIDEN" + "PROVIDE_HIDDEN" ;; 3.6 SECTIONS Command "SECTIONS" ;; 3.6.4.2 Input Section Wildcard Patterns diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 73957cab8e9..de2a00c3ad7 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1,7 +1,7 @@ ;;; sh-script.el --- shell-script editing commands for Emacs -;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2003, 2004, 2005, -;; 2006 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2002, +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Version: 2.0f diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el index 891549ac2aa..4c689a79fc7 100644 --- a/lisp/progmodes/simula.el +++ b/lisp/progmodes/simula.el @@ -1,6 +1,6 @@ ;;; simula.el --- SIMULA 87 code editing commands for Emacs -;; Copyright (C) 1992, 1994, 1996 2001, 2002, 2003, 2004, 2005, 2006 +;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Hans Henrik Eriksen <hhe@ifi.uio.no> |