--- a/.emacs-my Tue Apr 01 23:02:59 2014 +0300
+++ b/.emacs-my Fri Apr 04 23:05:53 2014 +0300
@@ -839,13 +839,11 @@
(setq uniquify-after-kill-buffer-p t)
(setq read-buffer-completion-ignore-case t)
+(setq read-file-name-completion-ignore-case t)
;; buffer-menu better then buffer-list, but ibuffer much better.
(global-set-key "\C-x\C-b" 'ibuffer)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(message "minibuffer")
-
(icomplete-mode 1)
(setq icomplete-with-completion-tables t)
@@ -856,7 +854,6 @@
;; Place dir at end to appear at the start of completion-ignored-extensions.
"CVS/" ".hg/" ".svn/" ".git/" ".bzr/"
) )
-(setq read-file-name-completion-ignore-case t)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(message "completion")
@@ -2263,7 +2260,6 @@
(global-semantic-idle-scheduler-mode 1)
(global-semantic-idle-summary-mode 1)
(global-semantic-idle-completions-mode 1)
- (global-semantic-decoration-mode 1)
(global-semantic-mru-bookmark-mode 1)
;; (setq semantic-stickyfunc-sticky-classes '(function type variable include package))
(global-semantic-stickyfunc-mode -1)
@@ -2709,10 +2705,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(message "web-mode")
-(setq web-mode-engine-file-regexps
- '(("jsp" . "\\.tagf?\\'")
- ("jsp" . "\\.jspf?\\'")))
-
(setq web-mode-markup-indent-offset 2
web-mode-css-indent-offset 2
web-mode-code-indent-offset 2
@@ -2723,12 +2715,17 @@
(ignore-errors (require 'web-mode))
(when (featurep 'web-mode)
+ (setq web-mode-engine-file-regexps (delq (assoc "jsp" web-mode-engine-file-regexps) web-mode-engine-file-regexps))
+ (mapc (lambda (i) (add-to-list 'web-mode-engine-file-regexps i))
+ '(("jsp" . "\\.tagf?\\'")
+ ("jsp" . "\\.jspf?\\'")))
(add-to-list 'auto-mode-alist '("\\.phtml\\'" . web-mode))
(add-to-list 'auto-mode-alist '("\\.php\\'" . web-mode))
(add-to-list 'auto-mode-alist '("\\.jspf?\\'" . web-mode))
(add-to-list 'auto-mode-alist '("/WEB-INF/tags/.*\\.tagf?\\'" . web-mode))
(add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode))
(add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode))
+ (add-to-list 'auto-mode-alist '("\\.php\\'" . web-mode))
(add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode))
(add-to-list 'auto-mode-alist '("\\.djhtml\\'" . web-mode))
(add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)) )