;; Nor fringes
(when (functionp 'fringe-mode) (fringe-mode '(0 . 0)))
+;; (when (functionp 'fringe-mode) (fringe-mode '(0 . 1)))
;; And I do not like scrollbar neither
(when (functionp 'scroll-bar-mode) (scroll-bar-mode -1))
;; use colorization for all modes
(global-font-lock-mode t)
-(setq font-lock-maximum-decoration 2
+(setq font-lock-maximum-decoration 3
;;'((latex-mode . 2) (t . 2))
)
(setq savehist-file "~/private/emacs/savehist")
(when (functionp 'savehist-mode) (savehist-mode 1))
+;; And allow minibuffer recursion
+(setq enable-recursive-minibuffers t)
+(minibuffer-depth-indicate-mode 1)
+
;; I do not like tooltips
(when (functionp 'tooltip-mode) (tooltip-mode nil))
backup-by-copying-when-linked t
)
-(setq
- user-emacs-directory "~/misc/emacs.d/")
+(setq tramp-backup-directory-alist backup-directory-alist)
+
+(setq user-emacs-directory "~/misc/emacs.d/")
(setq
abbrev-file-name (concat user-emacs-directory "abbrev_defs")
(info-title-2 :foreground "green")
(cperl-array-face :background "gray90" :foreground "blue" :weight 'bold)
(cperl-hash-face :background "gray90" :foreground "purple" :weight 'bold)
- (diff-added-face :foreground "blue" :weight 'bold)
- (diff-changed-face :foreground "green" :weight 'bold)
- (diff-removed-face :foreground "red" :weight 'bold)
+ (diff-added :background "gray90" :foreground "green4" :weight 'bold)
+ (diff-removed :background "gray90" :foreground "red2" :weight 'bold)
+ (diff-changed :background "gray90" :foreground "blue" :weight 'bold)
(diff-file-header-face :background "white" :foreground "black"
:weight 'bold)
(diff-header-face :background "white" :foreground "black")
(flyspell-incorrect-face :foreground "red2")
(flyspell-duplicate-face :foreground "OrangeRed2")
(hl-line :background "white")
- (sh-heredoc :foreground "blue")
- (sh-heredoc-face :foreground "blue")
+ (sh-heredoc :foreground "black" :background "#fff0f0")
+ (sh-heredoc-face :foreground "black" :background "#fff0f0")
(font-lock-keyword-face :foreground "blue")
(highlight :background "darkseagreen3")
(isearch :background "orange" :foreground "black")
(cperl-array-face :background "gray90" :foreground "blue" :weight 'bold)
(cperl-hash-face :background "gray90" :foreground "purple" :weight 'bold)
(message-cited-text :foreground "red4")
+ (diff-mode :background "gray90" :weight 'bold)
(diff-added :background "gray90" :foreground "green4" :weight 'bold)
(diff-removed :background "gray90" :foreground "red2" :weight 'bold)
- (diff-changed :background "gray90" :foreground "blue")
+ (diff-changed :background "gray90" :foreground "blue" :weight 'bold)
(diff-file-header :background "white" :foreground "black"
:weight 'bold)
(diff-header :background "white" :foreground "black")
(flyspell-incorrect-face :foreground "red2")
(flyspell-duplicate-face :foreground "OrangeRed2")
(hl-line :background "white")
+ (sh-heredoc :foreground "black" :background "#fff0f0")
+ (sh-heredoc-face :foreground "black" :background "#fff0f0")
(header-line :background "gray65")
- (sh-heredoc :foreground "darkorange3")
- (sh-heredoc-face :foreground "darkorange3")
(highlight :background "turquoise")
(message-cited-text-face :foreground "firebrick")
(isearch :background "yellow" :foreground "black")
(trailing-whitespace :background "gray65")
(cursor :inverse-video t)
(enotes/list-title-face :foreground "blue" :weight 'bold)
- (mode-line :background "#9090f0" :foreground "black" :box nil
+ (mode-line :background "#b0b0ff" :foreground "black" :box nil
:inverse-video nil)
(header-line :background "cornflowerblue" :foreground "black" :box nil
:inverse-video nil)
- (mode-line-inactive :background "#606080" :foreground "black" :box nil
+ (mode-line-inactive :background "#b0b0b0" :foreground "black" :box nil
:inverse-video nil)
;; (fringe :background "black" :foreground "gray90")
(fringe :background "gray65")
:inverse-video nil))
))
+;; Why should I have to do this?
+(add-hook 'sh-mode-hook
+ (lambda ()
+ (set-face-attribute 'sh-heredoc nil
+ :foreground "black"
+ :background "#fff0f0")
+ (set-face-attribute 'sh-heredoc-face nil
+ :foreground "black"
+ :background "#fff0f0")
+ ))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Move the window on the buffer without moving the cursor
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Printing
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(require 'ps-print)
+(load "ps-print")
(setq ps-print-color-p nil
;; ps-paper-type 'letter
(insert-file-contents-literally file)
(buffer-substring (point-at-bol) (point-at-eol))))
-(defun ff/battery-percent ()
- (/ (* 100 (string-to-number (ff/file-first-line (concat ff/battery-dir "/charge_now"))))
- (string-to-number (ff/file-first-line (concat ff/battery-dir "/charge_full")))))
+(defun ff/battery-percent (prefix)
+ (condition-case nil
+ (/ (* 100 (string-to-number (ff/file-first-line (format "%s/%s_now" ff/battery-dir prefix))))
+ (string-to-number (ff/file-first-line (format "%s/%s_full" ff/battery-dir prefix))))
+ (error -1))
+ )
(defun ff/laptop-info-string () (interactive)
(condition-case nil
(concat
;; The temperature
+
(let ((temp (/ (string-to-number (ff/file-first-line ff/temperature-file)) 1000)))
(if (> temp 50)
(concat
- (let ((s (format "%dC" temp)))
+ (let ((s (format "%dC " temp)))
(if (> temp 65) (propertize s 'face
'font-lock-warning-face)
s))
)
)
- " "
-
;; The battery
(let ((battery-status (ff/file-first-line (concat ff/battery-dir "/status"))))
(cond
((string= battery-status "Full") "L")
- ((string= battery-status "Charging") (format "L%d%%" (ff/battery-percent)))
- ((string= battery-status "Discharging") (format "B%d%%" (ff/battery-percent)))
- (t "?")))
+
+ ((string= battery-status "Charging")
+ (format "L%d%%" (max (ff/battery-percent "charge")
+ (ff/battery-percent "energy"))))
+
+ ((string= battery-status "Discharging")
+ (format "B%d%%" (max (ff/battery-percent "charge")
+ (ff/battery-percent "energy"))))
+
+ (t battery-status)
+
+ ))
)
load
,(if (ff/laptop-info-string)
- '(concat " /" (ff/laptop-info-string) "/"))
+ '(concat " " (ff/laptop-info-string)))
)
vc-follow-symlinks t
)
-(when (require 'vc-git nil t)
+(when (load "vc-git" nil t)
(add-to-list 'vc-handled-backends 'GIT))
;; alarm-vc.el is one of my own scripts, check my web page
;; Cool stuff to navigate in emacs-lisp sources
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(require 'find-func)
+(load "find-func")
(defun ff/goto-function-definition (&optional goback)
"Go directly to the definition of the function at point. With
"The face to display known mail identities.")
(defface ff/unknown-address-face
- '((t (:foreground "red4")))
+ '((t (:foreground "gray50")))
"The face to display unknown mail identities.")
(defun ff/explicit-name (email)
"The face to display the dates in the modeline.")
(defun ff/secure-note-add () (interactive)
- (find-file "~/private/secure-notes.gpg")
+ (find-file ff/secure-note-file)
;; Adds a new entry (i.e. date and a bunch of empty lines)
;; Strange that I have to specify that
;; (setq paragraph-separate "[% \f]*$")
;; (setq paragraph-separate
- ;; (concat "[%]*\\|[\f%]\\|[ \t]*\\($\\|"
- ;; "\\\\[][]\\|"
- ;; "\\\\" (regexp-opt (append
- ;; (mapcar 'car latex-section-alist)
- ;; '("begin" "label" "end" )) t)
- ;; "\\>\\|\\\\\\(" (regexp-opt '("item" "bibitem" "newline"
- ;; "noindent" "newpage" "footnote"
- ;; "marginpar" "parbox" "caption"))
- ;; "\\|\\$\\$\\|[a-z]*\\(space\\|skip\\|page[a-z]*\\)"
- ;; "\\>\\)[ \t]*\\($\\|%\\)\\)"))
+ ;; (concat "[%]*\\|[\f%]\\|[ \t]*\\($\\|"
+ ;; "\\\\[][]\\|"
+ ;; "\\\\" (regexp-opt (append
+ ;; (mapcar 'car latex-section-alist)
+ ;; '("begin" "label" "end" )) t)
+ ;; "\\>\\|\\\\\\(" (regexp-opt '("item" "bibitem" "newline"
+ ;; "noindent" "newpage" "footnote"
+ ;; "marginpar" "parbox" "caption"))
+ ;; "\\|\\$\\$\\|[a-z]*\\(space\\|skip\\|page[a-z]*\\)"
+ ;; "\\>\\)[ \t]*\\($\\|%\\)\\)"))
;; (flyspell-mode 1)
;; (reftex-mode 1)
))
(add-to-list 'find-file-not-found-functions 'ff/start-file)
(add-to-list 'find-file-not-found-hooks 'ff/start-file))
+(when (>= emacs-major-version 24)
+ (define-obsolete-function-alias 'make-local-hook 'ignore "21.1")
+ (setq send-mail-function 'sendmail-send-it) ;; emacs 24.x stuff
+
+ (custom-set-faces
+ '(diff-added ((default (:background "gray90" :foreground "green4" :weight bold))))
+ '(diff-removed ((default (:background "gray90" :foreground "red2" :weight bold))))
+ '(diff-changed ((default (:background "gray90" :foreground "blue" :weight bold))))
+ )
+ )
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-key global-map [f8] 'ff-find-other-file)
;; Keymaping
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(require 'info nil t)
+(load "info" nil t)
(define-key global-map [(shift iso-lefttab)] 'ispell-complete-word)
;; shift-tab going backward is kind of standard
;; exclusively with my selector.el
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(require 'recentf)
+(load "recentf")
(setq recentf-exclude
(append recentf-exclude
media/mplayer/args '(
"-framedrop"
"-zoom"
+ "-cache" "512"
"-subfont-osd-scale" "3"
;; "-stop-xscreensaver"
;; "-osdlevel" "3"
;; selector.el is one of my own scripts, check my web page
(when (ff/load-or-alert "selector" t)
- (define-key global-map [(shift return)] 'selector/quick-move-in-buffer)
+ ;; (define-key global-map [(shift return)] 'selector/quick-move-in-buffer)
(define-key global-map [(control x) (control b)] 'selector/switch-buffer)
(defun ff/visit-debpkg-file (&optional regexp)
)
(defun ff/flyspell-mode (arg) (interactive "p")
- (flyspell-mode)
- (when flyspell-mode (flyspell-buffer)))
+ (if flyspell-mode (flyspell-mode -1)
+ (flyspell-mode 1)
+ (flyspell-buffer))
+)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; The fridge!
;; ugly.
;; (defun ff/yank-with-xclip (&optional arg)
- ;; "Paste the content of the X clipboard with the xclip
-;; command. Without ARG converts some of the '\\uxxxx' characters."
- ;; (interactive "P")
- ;; (with-temp-buffer
- ;; (shell-command "xclip -o" t)
- ;; (unless arg
- ;; (mapc (lambda (x) (replace-string (concat "\\u" (car x)) (cdr x) nil (point-min) (point-max)))
- ;; '(("fffd" . "??")
- ;; ("2013" . "-")
- ;; ("2014" . "--")
- ;; ("2018" . "`")
- ;; ("2019" . "'")
- ;; ("201c" . "``")
- ;; ("201d" . "''")
- ;; ("2022" . "*")
- ;; ("2026" . "...")
- ;; ("20ac" . "EUR")
- ;; )))
- ;; (kill-ring-save (point-min) (point-max)))
-
- ;; (yank))
+ ;; "Paste the content of the X clipboard with the xclip
+ ;; command. Without ARG converts some of the '\\uxxxx' characters."
+ ;; (interactive "P")
+ ;; (with-temp-buffer
+ ;; (shell-command "xclip -o" t)
+ ;; (unless arg
+ ;; (mapc (lambda (x) (replace-string (concat "\\u" (car x)) (cdr x) nil (point-min) (point-max)))
+ ;; '(("fffd" . "??")
+ ;; ("2013" . "-")
+ ;; ("2014" . "--")
+ ;; ("2018" . "`")
+ ;; ("2019" . "'")
+ ;; ("201c" . "``")
+ ;; ("201d" . "''")
+ ;; ("2022" . "*")
+ ;; ("2026" . "...")
+ ;; ("20ac" . "EUR")
+ ;; )))
+ ;; (kill-ring-save (point-min) (point-max)))
+
+ ;; (yank))
;; (define-key global-map [(meta y)] 'ff/yank-with-xclip)
projects / elisp.git / blobdiff