Permalink
Browse files

Revert "Use rx for regex construction for great justice."

This reverts commit eff2c75.
  • Loading branch information...
1 parent 57df636 commit fa60db0b2a89d8ffc77b93b5dbb2571149963e7a @technomancy committed Dec 10, 2008
Showing with 6 additions and 12 deletions.
  1. +1 −2 starter-kit-defuns.el
  2. +3 −8 starter-kit-eshell.el
  3. +2 −2 starter-kit-lisp.el
View
@@ -80,8 +80,7 @@
(defun pretty-lambdas ()
(font-lock-add-keywords
- nil `(((rx (opt "(")
- (group "lambda" word-end))
+ nil `(("(?\\(lambda\\>\\)"
(0 (progn (compose-region (match-beginning 1) (match-end 1)
,(make-char 'greek-iso8859-7 107))
nil))))))
View
@@ -4,12 +4,7 @@
(setq eshell-cmpl-cycle-completions nil
eshell-save-history-on-exit t
- eshell-cmpl-dir-ignore (rx bos (or (and "." (opt "."))
- "CVS"
- ".svn"
- ".git")
- "/"
- eos))
+ eshell-cmpl-dir-ignore "\\`\\(\\.\\.?\\|CVS\\|\\.svn\\|\\.git\\)/\\'")
(eval-after-load 'esh-opt
'(progn
@@ -23,9 +18,9 @@
(add-to-list 'eshell-visual-commands "ssh")
(add-to-list 'eshell-visual-commands "tail")
(add-to-list 'eshell-command-completions-alist
- `("gunzip" ,(rx "gz" eos)))
+ '("gunzip" "gz\\'"))
(add-to-list 'eshell-command-completions-alist
- `("tar" ,(rx (group (or ".tar" ".tgz" ".tar.gz" eos)))))
+ '("tar" "\\(\\.tar|\\.tgz\\|\\.tar\\.gz\\)\\'"))
(add-to-list 'eshell-output-filter-functions 'eshell-handle-ansi-color)))
(provide 'starter-kit-eshell)
View
@@ -17,10 +17,10 @@
(delete-file (concat buffer-file-name "c"))))))
(font-lock-add-keywords 'emacs-lisp-mode
- `((,(rx (or "(" ")")) paren-face)))
+ '(("(\\|)" . 'paren-face)))
(font-lock-add-keywords 'scheme-mode
- `((,(rx (or "(" ")")) paren-face)))
+ '(("(\\|)" . 'paren-face)))
(define-key lisp-mode-shared-map (kbd "C-c l") "lambda")

0 comments on commit fa60db0

Please sign in to comment.