aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-01-20 21:04:45 -0800
committerGlenn Morris2011-01-20 21:04:45 -0800
commitd00b05c949aa1078922281188cdb74689077ddfa (patch)
treedc4d4b5169f759605a3a5647c20ed6179479dce2
parent9d760d754bde2eadd3f017fec5ea1cbe3810d666 (diff)
downloademacs-d00b05c949aa1078922281188cdb74689077ddfa.tar.gz
emacs-d00b05c949aa1078922281188cdb74689077ddfa.zip
compile.el fix for bug#7812
* lisp/progmodes/compile.el (compilation-error-regexp-alist): Fix custom type.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/compile.el7
2 files changed, 7 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0cb79fe8c29..865f46562cf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-01-21 Glenn Morris <rgm@gnu.org>
2
3 * progmodes/compile.el (compilation-error-regexp-alist):
4 Fix custom type. (Bug#7812)
5
12011-01-17 Stefan Monnier <monnier@iro.umontreal.ca> 62011-01-17 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the 8 * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the
@@ -12487,4 +12492,3 @@ See ChangeLog.14 for earlier changes.
12487 12492
12488 You should have received a copy of the GNU General Public License 12493 You should have received a copy of the GNU General Public License
12489 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 12494 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
12490
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index a3eb0763f57..e6cbced1fcf 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -499,10 +499,8 @@ matched by the whole REGEXP becomes the hyperlink.
499 499
500Additional HIGHLIGHTs as described under `font-lock-keywords' can 500Additional HIGHLIGHTs as described under `font-lock-keywords' can
501be added." 501be added."
502 :type `(set :menu-tag "Pick" 502 :type '(repeat (choice (symbol :tag "Predefined symbol")
503 ,@(mapcar (lambda (elt) 503 (sexp :tag "Error specification")))
504 (list 'const (car elt)))
505 compilation-error-regexp-alist-alist))
506 :link `(file-link :tag "example file" 504 :link `(file-link :tag "example file"
507 ,(expand-file-name "compilation.txt" data-directory)) 505 ,(expand-file-name "compilation.txt" data-directory))
508 :group 'compilation) 506 :group 'compilation)
@@ -2389,5 +2387,4 @@ The file-structure looks like this:
2389 2387
2390(provide 'compile) 2388(provide 'compile)
2391 2389
2392;; arch-tag: 12465727-7382-4f72-b234-79855a00dd8c
2393;;; compile.el ends here 2390;;; compile.el ends here