bug#8547: 23.3.50; conf-mode-maybe rule grabs config.h.in

bug#8547: 23.3.50; conf-mode-maybe rule grabs config.h.in

[Reuben Thomas]

The current rule in files.el for conf-mode-maybe grabs config.h.in,
which should instead go through the .in-stripping rule and end up in
c-mode.

From the comment for that rule, it seems that the only time it should
allow an extra (middle) suffix is when that is .local, so changing it to
something like

     ("[/.]c\\(?:on\\)?f\\(?:i?g\\)?\\(?:\\(\\.local\\)?\\.[a-zA-Z0-9_-]+\\)?\\'" . conf-mode-maybe)

i.e. removing period from the character class at the end and adding an
explicit optional .local before it, should work.


In GNU Emacs 23.3.50.1 (i686-pc-linux-gnu, GTK+ Version 2.24.4)
 of 2011-04-24 on canta
Windowing system distributor `The X.Org Foundation', version 11.0.11001000
Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: en_GB.utf8
  value of $XMODIFIERS: nil
  locale-coding-system: utf-8-unix
  default enable-multibyte-characters: t

Major mode: Emacs-Lisp

Minor modes in effect:
  filladapt-mode: t
  recentf-mode: t
  show-paren-mode: t
  savehist-mode: t
  minibuffer-electric-default-mode: t
  iswitchb-mode: t
  icomplete-mode: t
  global-whitespace-mode: t
  global-auto-revert-mode: t
  desktop-save-mode: t
  mouse-wheel-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  column-number-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <up> <up> <up> 
<down> <return> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<return> C-s a u t o - m o d e - C-s C-s C-s C-s C-s 
C-a C-x C-f C-g C-x k <return> C-x o C-x b <return> 
C-x 1 C-x b C-g C-x b C-s <return> M-< M-> M-< M-> 
M-< M-> M-< C-x k <return> C-h v <up> <return> C-s 
c o n f - m o d e C-a <down> <down> <down> <down> <down> 
<down> <down> <down> <down> <down> <down> M-< C-s c 
o n f - m o d d e <backspace> <backspace> e C-s C-x 
C-f <up> <return> C-x k <return> C-s C-s C-a <down-mouse-1> 
<drag-mouse-1> <down-mouse-1> <mouse-1> C-a C-SPC C-n 
C-k C-x b <return> C-s c o n f g C-g C-x b <return> 
C-x C-f ~ / r e p o / l i s <backspace> <backspace> 
<backspace> e m a c s - 2 3 / l i s <tab> ` f <backspace> 
<backspace> f i l e s . e l <return> C-s c o n f i 
g - <backspace> <backspace> <backspace> - m o d e - 
m a y b e C-a C-SPC C-n C-k C-_ C-p C-SPC C-n <C-insert> 
M-x r e p o r t = - <backspace> <backspace> - e m a 
c s - b u g <return>

Recent messages:
Mark set [7 times]
Mark saved where search started
Mark set
Mark saved where search started [2 times]
Mark set [2 times]
Read only text copied to kill ring
Mark saved where search started [2 times]
Mark set
Undo!
Mark activated

Load-path shadows:
/home/rrt/.emacs.d/elpa/dictionary-1.8.7/link hides /usr/local/share/emacs/23.3.50/site-lisp/dictionary-el/link
/home/rrt/.emacs.d/elpa/dictionary-1.8.7/connection hides /usr/local/share/emacs/23.3.50/site-lisp/dictionary-el/connection
/home/rrt/.emacs.d/elpa/dictionary-1.8.7/dictionary-init hides /usr/local/share/emacs/23.3.50/site-lisp/dictionary-el/dictionary-init
/home/rrt/.emacs.d/elpa/dictionary-1.8.7/dictionary hides /usr/local/share/emacs/23.3.50/site-lisp/dictionary-el/dictionary
/home/rrt/local/share/emacs/site-lisp/graphviz-dot-mode hides /usr/local/share/emacs/23.3.50/site-lisp/emacs-goodies-el/graphviz-dot-mode
/home/rrt/local/share/emacs/site-lisp/dict hides /usr/local/share/emacs/23.3.50/site-lisp/emacs-goodies-el/dict
/usr/local/share/emacs/23.3.50/site-lisp/css-mode/css-mode hides /usr/local/share/emacs/23.3.50/lisp/textmodes/css-mode
/usr/share/emacs-snapshot/site-lisp/ruby1.8-elisp/ruby-mode hides /usr/local/share/emacs/23.3.50/lisp/progmodes/ruby-mode
/usr/local/share/emacs/23.3.50/site-lisp/css-mode/css-mode hides /usr/share/emacs/site-lisp/css-mode/css-mode
/usr/local/share/emacs/23.3.50/site-lisp/auctex/tex-info hides /usr/share/emacs/site-lisp/auctex/tex-info
/usr/local/share/emacs/23.3.50/site-lisp/auctex/context-nl hides /usr/share/emacs/site-lisp/auctex/context-nl
/usr/local/share/emacs/23.3.50/site-lisp/auctex/context-en hides /usr/share/emacs/site-lisp/auctex/context-en
/usr/local/share/emacs/23.3.50/site-lisp/auctex/latex hides /usr/share/emacs/site-lisp/auctex/latex
/usr/local/share/emacs/23.3.50/site-lisp/auctex/tex-mik hides /usr/share/emacs/site-lisp/auctex/tex-mik
/usr/local/share/emacs/23.3.50/site-lisp/auctex/tex-buf hides /usr/share/emacs/site-lisp/auctex/tex-buf
/usr/local/share/emacs/23.3.50/site-lisp/auctex/tex-jp hides /usr/share/emacs/site-lisp/auctex/tex-jp
/usr/local/share/emacs/23.3.50/site-lisp/auctex/tex-bar hides /usr/share/emacs/site-lisp/auctex/tex-bar
/usr/local/share/emacs/23.3.50/site-lisp/auctex/tex hides /usr/share/emacs/site-lisp/auctex/tex
/usr/local/share/emacs/23.3.50/site-lisp/auctex/multi-prompt hides /usr/share/emacs/site-lisp/auctex/multi-prompt
/usr/local/share/emacs/23.3.50/site-lisp/auctex/tex-fptex hides /usr/share/emacs/site-lisp/auctex/tex-fptex
/usr/local/share/emacs/23.3.50/site-lisp/auctex/tex-font hides /usr/share/emacs/site-lisp/auctex/tex-font
/usr/local/share/emacs/23.3.50/site-lisp/auctex/tex-fold hides /usr/share/emacs/site-lisp/auctex/tex-fold
/usr/local/share/emacs/23.3.50/site-lisp/auctex/texmathp hides /usr/share/emacs/site-lisp/auctex/texmathp
/usr/local/share/emacs/23.3.50/site-lisp/auctex/context hides /usr/share/emacs/site-lisp/auctex/context
/usr/local/share/emacs/23.3.50/site-lisp/auctex/font-latex hides /usr/share/emacs/site-lisp/auctex/font-latex
/usr/local/share/emacs/23.3.50/site-lisp/auctex/bib-cite hides /usr/share/emacs/site-lisp/auctex/bib-cite
/usr/local/share/emacs/23.3.50/site-lisp/auctex/toolbar-x hides /usr/share/emacs/site-lisp/auctex/toolbar-x
/usr/local/share/emacs/23.3.50/site-lisp/auctex/tex-style hides /usr/share/emacs/site-lisp/auctex/tex-style

Features:
(shadow sort mail-extr message sendmail ecomplete rfc822 mml mml-sec
password-cache mm-decode mm-bodies mm-encode mailcap mail-parse rfc2231
rfc2047 rfc2045 qp ietf-drums mailabbrev nnheader gnus-util netrc
time-date mm-util mail-prsvr gmm-utils mailheader canlock hashcash
mail-utils emacsbug jka-compr find-func multi-isearch pp help-mode view
sgml-mode js2-mode imenu js2-indent js2-parse js2-browse js2-highlight
js2-ast js2-messages js2-scan js2-util js2-vars js2-externs vc-git
conf-mode newcomment vc-bzr sha1 hex-util autoconf autoconf-mode
face-remap filladapt flyspell completing-help recentf tree-widget
wid-edit uniquify paren savehist minibuf-eldef iswitchb icomplete
whitespace autorevert time cus-start cus-load desktop server php-mode
etags cc-langs cc-mode cc-fonts cc-menus cc-cmds cc-styles cc-align
cc-engine cc-vars cc-defs speedbar sb-image ezimage dframe lua-mode
regexp-opt comint ring ropemacs pymacs ffap ispell smart-quotes
auto-dictionary-autoloads c-eldoc-autoloads dictionary-autoloads
diff-git-autoloads dired-isearch-autoloads full-ack-autoloads
guess-style-autoloads kill-ring-search-autoloads magit-autoloads
mv-shell-autoloads tumble-autoloads http-post-simple-autoloads package
reporter advice advice-preload yasnippet help-fns derived edmacro kmacro
easymenu assoc cl cl-19 muse-autoloads emacs-goodies-el
emacs-goodies-custom emacs-goodies-loaddefs easy-mmode bbdb-autoloads
preview-latex tex-site auto-loads tooltip ediff-hook vc-hooks
lisp-float-type mwheel x-win x-dnd font-setting tool-bar dnd fontset
image fringe lisp-mode register page menu-bar rfn-eshadow timer select
scroll-bar mldrag mouse jit-lock font-lock syntax facemenu font-core
frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai
tai-viet lao korean japanese hebrew greek romanian slovak czech european
ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help
simple abbrev loaddefs button minibuffer faces cus-face files
text-properties overlay md5 base64 format env code-pages mule custom
widget hashtable-print-readable backquote make-network-process dbusbind
system-font-setting font-render-setting gtk x-toolkit x multi-tty emacs)

-- 
http://rrt.sc3d.org/

bug#8547: 23.3.50; conf-mode-maybe rule grabs config.h.in

[Chong Yidong]

Reuben Thomas <rrt@sc3d.org> writes:

> The current rule in files.el for conf-mode-maybe grabs config.h.in,
> which should instead go through the .in-stripping rule and end up in
> c-mode.
>
> From the comment for that rule, it seems that the only time it should
> allow an extra (middle) suffix is when that is .local, so changing it to
> something like
>
>      ("[/.]c\\(?:on\\)?f\\(?:i?g\\)?\\(?:\\(\\.local\\)?\\.[a-zA-Z0-9_-]+\\)?\\'" . conf-mode-maybe)
>
> i.e. removing period from the character class at the end and adding an
> explicit optional .local before it, should work.

The comment actually says that config.foo should also work.  I've
committed a different fix based on reordering the rules.  Thanks.