Compiler fixes + tweak eshell settings

	* 05-latex-sy.el: Don't have latex-toolbar anymore

	* 00-build.el: defvar `eshell-mode-map', don't require w3-script.

	* 11-pkgs-sy.el (eshell-modules-list): Don't load eshell-smart
	because I hate the way it brings the cursor back to the previous
	prompt instead of the current.

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/00-build.el b/00-build.el
index 1f9a3c3..350feeb 100644 (file)
--- a/00-build.el
+++ b/00-build.el
@@ -5,7 +5,7 @@
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>

-;; Time-stamp: <Sunday Jun 10, 2012 10:23:33 steve>
+;; Time-stamp: <Saturday Jun 23, 2012 13:11:29 steve>

 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/00-build.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/00-build.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit


@@ -141,6 +141,7 @@
   ;(defvar xwem-global-map global-map)
   ;(defvar xwem-sound-alist nil)
   ;(defvar xwem-started nil)
   ;(defvar xwem-global-map global-map)
   ;(defvar xwem-sound-alist nil)
   ;(defvar xwem-started nil)

+  (defvar eshell-mode-map nil)

   (autoload #'executable-find "executable")
   (autoload #'morse-region "morse" nil t)
   (autoload #'read-kbd-macro "edmacro" nil t)
   (autoload #'executable-find "executable")
   (autoload #'morse-region "morse" nil t)
   (autoload #'read-kbd-macro "edmacro" nil t)


@@ -167,7 +168,6 @@
 
 (eval-when-compile
   (defvar c-enable-xemacs-performance-kludge-p)
 
 (eval-when-compile
   (defvar c-enable-xemacs-performance-kludge-p)

-  (defvar eshell-mode-map)

   (defvar riece-unread-channels)
   (autoload #'ansi-color-apply-on-region "ansi-color")
   (autoload #'blink-cursor-mode "blink-cursor" nil t)
   (defvar riece-unread-channels)
   (autoload #'ansi-color-apply-on-region "ansi-color")
   (autoload #'blink-cursor-mode "blink-cursor" nil t)


@@ -213,7 +213,7 @@
   (require 'url-news)
   (require 'w3)
   (require 'w3-java)
   (require 'url-news)
   (require 'w3)
   (require 'w3-java)

-  (require 'w3-script)
+  ;(require 'w3-script)

   ;(require 'xwem-keyboard)
   ;(require 'xwem-mpd)
 )
   ;(require 'xwem-keyboard)
   ;(require 'xwem-mpd)
 )

diff --git a/05-latex-sy.el b/05-latex-sy.el
index 39f1180..72e873c 100644 (file)
--- a/05-latex-sy.el
+++ b/05-latex-sy.el
@@ -5,7 +5,7 @@
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>

-;; Time-stamp: <Sunday Jun 10, 2012 10:55:18 steve>
+;; Time-stamp: <Saturday Jun 23, 2012 13:00:04 steve>

 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/05-latex-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/05-latex-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit


@@ -227,13 +227,13 @@ Replacement for count-lines-region."
                 TeX-run-command nil t))))
 
 ;; Add a couple more things if we're in X
                 TeX-run-command nil t))))
 
 ;; Add a couple more things if we're in X

-(when (and (device-on-window-system-p)
-          (featurep 'latex-toolbar)
-          (featurep 'outl-mouse))
-  (add-hook 'LaTeX-mode-hook
-           #'(lambda ()
-               (turn-on-outl-mouse-minor-mode)
-               (latex-toolbar-install))))
+;;(when (and (device-on-window-system-p)
+;;        (featurep 'latex-toolbar)
+;;        (featurep 'outl-mouse))
+;;  (add-hook 'LaTeX-mode-hook
+;;         #'(lambda ()
+;;             (turn-on-outl-mouse-minor-mode)
+;;             (latex-toolbar-install))))

 
 (setq LaTeX-section-hook
       '(LaTeX-section-heading
 
 (setq LaTeX-section-hook
       '(LaTeX-section-heading

diff --git a/11-pkgs-sy.el b/11-pkgs-sy.el
index 2396e07..213df9a 100644 (file)
--- a/11-pkgs-sy.el
+++ b/11-pkgs-sy.el
@@ -5,7 +5,7 @@
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>
 ;;     Author: Steve Youngs <steve@sxemacs.org>
 ;; Maintainer: Steve Youngs <steve@sxemacs.org>
 ;;    Created: <2007-12-02>

-;; Time-stamp: <Saturday Jun 23, 2012 12:34:09 steve>
+;; Time-stamp: <Saturday Jun 23, 2012 13:01:42 steve>

 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/11-pkgs-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit
 ;;   Download: <http://bastard.steveyoungs.com/~steve/SXEmacs/inits/>
 ;;   HTMLised: <http://bastard.steveyoungs.com/~steve/SXEmacs/htmlinits/11-pkgs-sy.html>
 ;;   Git Repo: git clone http://git.sxemacs.org/syinit


@@ -368,7 +368,7 @@
                       eshell-prompt
                       ;eshell-rebind 
                       eshell-script
                       eshell-prompt
                       ;eshell-rebind 
                       eshell-script

-                      eshell-smart
+                      ;eshell-smart

                       eshell-term
                       eshell-unix
                       eshell-xtra))
                       eshell-term
                       eshell-unix
                       eshell-xtra))