From a5f6962885f16f78ed2d0aac661b5142045ce6d2 Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Sun, 9 Apr 2006 01:36:50 +0000 Subject: [PATCH] Try to fix failure to recognize Muse file extension (2nd attempt). * lisp/muse.el: Try to fix failure to put muse-mode-choose-mode in auto-mode-alist. git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-99 --- ChangeLog.2006 | 14 ++++++++++++++ lisp/muse.el | 15 +++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/ChangeLog.2006 b/ChangeLog.2006 index b741767..2eafd7b 100644 --- a/ChangeLog.2006 +++ b/ChangeLog.2006 @@ -2,6 +2,20 @@ # arch-tag: automatic-ChangeLog--mwolson@gnu.org--2006/muse--main--1.0 # +2006-04-09 01:36:50 GMT Michael Olson patch-99 + + Summary: + Try to fix failure to recognize Muse file extension (2nd attempt). + Revision: + muse--main--1.0--patch-99 + + * lisp/muse.el: Try to fix failure to put muse-mode-choose-mode in + auto-mode-alist. + + modified files: + ChangeLog.2006 lisp/muse.el + + 2006-04-08 17:08:39 GMT Michael Olson patch-98 Summary: diff --git a/lisp/muse.el b/lisp/muse.el index 42859a5..b2267ca 100644 --- a/lisp/muse.el +++ b/lisp/muse.el @@ -92,7 +92,8 @@ This is autogenerated from `muse-ignored-extensions'.") auto-mode-alist))) (set sym val) ;; associate .muse with muse-mode - (when (and val (featurep 'muse-mode)) + (when (and (stringp val) + (featurep 'muse-mode)) (add-to-list 'auto-mode-alist (cons (concat "\\." val "\\'") 'muse-mode-choose-mode))) @@ -124,18 +125,20 @@ This is autogenerated from `muse-ignored-extensions'.") (add-hook 'muse-update-values-hook (lambda () - (muse-update-file-extension - 'muse-file-extension muse-file-extension))) + (muse-update-ignored-extensions-regexp + 'muse-ignored-extensions-regexp muse-ignored-extensions-regexp))) ;; Once the user's init file has been processed, determine whether ;; they want a file extension (if inhibit-startup-hooks ;; we've already started Emacs, so just update the extension now - (muse-update-file-extension 'muse-file-extension muse-file-extension) + (unless (rassoc 'muse-mode-choose-mode auto-mode-alist) + (muse-update-file-extension 'muse-file-extension muse-file-extension)) (add-hook 'emacs-startup-hook (lambda () - (muse-update-file-extension - 'muse-file-extension muse-file-extension)))) + (unless (rassoc 'muse-mode-choose-mode auto-mode-alist) + (muse-update-file-extension + 'muse-file-extension muse-file-extension))))) (defcustom muse-ignored-extensions '("bz2" "gz" "[Zz]") "A list of extensions to omit from the ending of a Muse page name. -- 2.11.4.GIT