From 28b6d09ef131669255423a58ff54e30ec919a491 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Fri, 21 Dec 2012 16:06:22 -0500 Subject: [PATCH] refactored the whole setup and use jedi for python auto completion --- custom-modes/heartbeat-cursor.el | 37 - emacs-for-python | 1 - extensions/flymake-cursor.el | 44 + extensions/flymake-patch.el | 1799 +++++++++++++++++ extensions/pymacs.el | 813 ++++++++ my-funcs-virga.el => funcs-virga.el | 2 +- my-funcs.el => funcs.el | 2 +- .../init-ace-jump-mode.el | 0 init-package/init-auto-complete.el | 7 + .../init-erlang.el | 0 .../init-evil.el | 0 .../init-fill-column-indicator.el | 0 .../init-highlight-symbol.el | 0 init-package/init-ipython.el | 9 + init-package/init-jedi.el | 1 + {my-package-init => init-package}/init-p4.el | 0 .../init-powerline.el | 0 .../init-rainbow-delimiters.el | 0 init-package/init-smart-operator.el | 1 + .../init-solarized-theme.el | 0 .../init-surround.el | 0 init-package/init-yasnippet.el | 5 + init.el | 67 +- ...ybindings-virga.el => keybindings-virga.el | 2 +- my-keybindings.el => keybindings.el | 2 +- my-packages.el => packages.el | 20 +- post/python.el | 73 + pre/editing.el | 11 + pre/navigating.el | 3 + pre/session.el | 11 + config/global.el => pre/ui.el | 32 +- 31 files changed, 2830 insertions(+), 112 deletions(-) delete mode 100644 custom-modes/heartbeat-cursor.el delete mode 160000 emacs-for-python create mode 100644 extensions/flymake-cursor.el create mode 100644 extensions/flymake-patch.el create mode 100644 extensions/pymacs.el rename my-funcs-virga.el => funcs-virga.el (96%) rename my-funcs.el => funcs.el (99%) rename {my-package-init => init-package}/init-ace-jump-mode.el (100%) create mode 100644 init-package/init-auto-complete.el rename {my-package-init => init-package}/init-erlang.el (100%) rename {my-package-init => init-package}/init-evil.el (100%) rename {my-package-init => init-package}/init-fill-column-indicator.el (100%) rename {my-package-init => init-package}/init-highlight-symbol.el (100%) create mode 100644 init-package/init-ipython.el create mode 100644 init-package/init-jedi.el rename {my-package-init => init-package}/init-p4.el (100%) rename {my-package-init => init-package}/init-powerline.el (100%) rename {my-package-init => init-package}/init-rainbow-delimiters.el (100%) create mode 100644 init-package/init-smart-operator.el rename {my-package-init => init-package}/init-solarized-theme.el (100%) rename {my-package-init => init-package}/init-surround.el (100%) create mode 100644 init-package/init-yasnippet.el rename my-keybindings-virga.el => keybindings-virga.el (85%) rename my-keybindings.el => keybindings.el (83%) rename my-packages.el => packages.el (81%) create mode 100644 post/python.el create mode 100644 pre/editing.el create mode 100644 pre/navigating.el create mode 100644 pre/session.el rename config/global.el => pre/ui.el (51%) diff --git a/custom-modes/heartbeat-cursor.el b/custom-modes/heartbeat-cursor.el deleted file mode 100644 index 58b746454..000000000 --- a/custom-modes/heartbeat-cursor.el +++ /dev/null @@ -1,37 +0,0 @@ -(require 'cl) -(require 'color) - -(defvar heartbeat-fps 16) -(defvar heartbeat-period 4) - -(defun heartbeat-range (from to cnt) - (let ((step (/ (- to from) (float cnt)))) - (loop for i below cnt collect (+ from (* step i))))) - -(defun heartbeat-cursor-colors () - (let ((cnt (* heartbeat-period heartbeat-fps))) - (mapcar (lambda (r) - (color-rgb-to-hex r 0 0)) - (nconc (heartbeat-range .2 1 (/ cnt 2)) - (heartbeat-range 1 .2 (/ cnt 2)))))) - -(defvar heartbeat-cursor-timer nil) -(defvar heartbeat-cursor-old-color) - -(define-minor-mode heartbeat-cursor-mode - "Change cursor color with the heartbeat effect." - nil "" nil - :global t - (when heartbeat-cursor-timer - (cancel-timer heartbeat-cursor-timer) - (setq heartbeat-cursor-timer nil) - (set-face-background 'cursor heartbeat-cursor-old-color)) - (when heartbeat-cursor-mode - (setq heartbeat-cursor-old-color (face-background 'cursor) - heartbeat-cursor-timer - (run-with-timer - 0 (/ 1 (float heartbeat-fps)) - (lexical-let ((colors (heartbeat-cursor-colors)) tail) - (lambda () - (setq tail (or (cdr tail) colors)) - (set-face-background 'cursor (car tail)))))))) diff --git a/emacs-for-python b/emacs-for-python deleted file mode 160000 index 08012bc1d..000000000 --- a/emacs-for-python +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 08012bc1db1259648ebda3b8b9b4f711db367bfe diff --git a/extensions/flymake-cursor.el b/extensions/flymake-cursor.el new file mode 100644 index 000000000..5673cd41e --- /dev/null +++ b/extensions/flymake-cursor.el @@ -0,0 +1,44 @@ +;; -*- emacs-lisp -*- +;; License: Gnu Public License +;; +;; Additional functionality that makes flymake error messages appear +;; in the minibuffer when point is on a line containing a flymake +;; error. This saves having to mouse over the error, which is a +;; keyboard user's annoyance + +;;flymake-ler(file line type text &optional full-file) +(defun show-fly-err-at-point () + "If the cursor is sitting on a flymake error, display the +message in the minibuffer" + (interactive) + (let ((line-no (line-number-at-pos))) + (dolist (elem flymake-err-info) + (if (eq (car elem) line-no) + (let ((err (car (second elem)))) + (message "%s" (fly-pyflake-determine-message err))))))) + +(defun fly-pyflake-determine-message (err) + "pyflake is flakey if it has compile problems, this adjusts the +message to display, so there is one ;)" + (cond ((not (or (eq major-mode 'Python) (eq major-mode 'python-mode) t))) + ((null (flymake-ler-file err)) + ;; normal message do your thing + (flymake-ler-text err)) + (t ;; could not compile err + (format "compile error, problem on line %s" (flymake-ler-line err))))) + +(defadvice flymake-goto-next-error (after display-message activate compile) + "Display the error in the mini-buffer rather than having to mouse over it" + (show-fly-err-at-point)) + +(defadvice flymake-goto-prev-error (after display-message activate compile) + "Display the error in the mini-buffer rather than having to mouse over it" + (show-fly-err-at-point)) + +(defadvice flymake-mode (before post-command-stuff activate compile) + "Add functionality to the post command hook so that if the +cursor is sitting on a flymake error the error information is +displayed in the minibuffer (rather than having to mouse over +it)" + (set (make-local-variable 'post-command-hook) + (cons 'show-fly-err-at-point post-command-hook))) diff --git a/extensions/flymake-patch.el b/extensions/flymake-patch.el new file mode 100644 index 000000000..ba4885536 --- /dev/null +++ b/extensions/flymake-patch.el @@ -0,0 +1,1799 @@ +;;; flymake.el -- a universal on-the-fly syntax checker + +;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 +;; Free Software Foundation, Inc. + +;; Author: Pavel Kobyakov +;; Maintainer: Pavel Kobyakov +;; Version: 0.3 +;; Keywords: c languages tools + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: +;; +;; Flymake is a minor Emacs mode performing on-the-fly syntax +;; checks using the external syntax check tool (for C/C++ this +;; is usually the compiler) + +;;; Bugs/todo: + +;; - Only uses "Makefile", not "makefile" or "GNUmakefile" +;; (from http://bugs.debian.org/337339). + +;; - Adding info messages +;;; Code: + +(eval-when-compile (require 'cl)) +(if (featurep 'xemacs) (require 'overlay)) + +(defvar flymake-is-running nil + "If t, flymake syntax check process is running for the current buffer.") +(make-variable-buffer-local 'flymake-is-running) + +(defvar flymake-timer nil + "Timer for starting syntax check.") +(make-variable-buffer-local 'flymake-timer) + +(defvar flymake-last-change-time nil + "Time of last buffer change.") +(make-variable-buffer-local 'flymake-last-change-time) + +(defvar flymake-check-start-time nil + "Time at which syntax check was started.") +(make-variable-buffer-local 'flymake-check-start-time) + +(defvar flymake-check-was-interrupted nil + "Non-nil if syntax check was killed by `flymake-compile'.") +(make-variable-buffer-local 'flymake-check-was-interrupted) + +(defvar flymake-err-info nil + "Sorted list of line numbers and lists of err info in the form (file, err-text).") +(make-variable-buffer-local 'flymake-err-info) + +(defvar flymake-new-err-info nil + "Same as `flymake-err-info', effective when a syntax check is in progress.") +(make-variable-buffer-local 'flymake-new-err-info) + +;;;; [[ cross-emacs compatibility routines +(defsubst flymake-makehash (&optional test) + (if (fboundp 'make-hash-table) + (if test (make-hash-table :test test) (make-hash-table)) + (with-no-warnings + (makehash test)))) + +(defalias 'flymake-float-time + (if (fboundp 'float-time) + 'float-time + (if (featurep 'xemacs) + (lambda () + (multiple-value-bind (s0 s1 s2) (values-list (current-time)) + (+ (* (float (ash 1 16)) s0) (float s1) (* 0.0000001 s2))))))) + +(defalias 'flymake-replace-regexp-in-string + (if (eval-when-compile (fboundp 'replace-regexp-in-string)) + 'replace-regexp-in-string + (lambda (regexp rep str) + (replace-in-string str regexp rep)))) + +(defalias 'flymake-split-string + (if (condition-case nil (equal (split-string " bc " " " t) '("bc")) + (error nil)) + (lambda (str pattern) (split-string str pattern t)) + (lambda (str pattern) + "Split STR into a list of substrings bounded by PATTERN. +Zero-length substrings at the beginning and end of the list are omitted." + (let ((split (split-string str pattern))) + (while (equal (car split) "") (setq split (cdr split))) + (setq split (nreverse split)) + (while (equal (car split) "") (setq split (cdr split))) + (nreverse split))))) + +(defalias 'flymake-get-temp-dir + (if (fboundp 'temp-directory) + 'temp-directory + (lambda () temporary-file-directory))) + +(defalias 'flymake-line-beginning-position + (if (fboundp 'line-beginning-position) + 'line-beginning-position + (lambda (&optional arg) (save-excursion (beginning-of-line arg) (point))))) + +(defalias 'flymake-line-end-position + (if (fboundp 'line-end-position) + 'line-end-position + (lambda (&optional arg) (save-excursion (end-of-line arg) (point))))) + + +;;; Personalized functions to be used in general +(defun string-match-multi (reglist str) + "Matches STR with each of the regex in REGLIST, return the results of string-match" + (mapcar + (lambda (reg) (string-match reg str)) + reglist) + ) + +(defun one-true (mylist) + "Return t if one element of the list MYLIST return t, else it return nil" + (let ((mylist mylist) (ret nil)) + (while mylist + (if (car mylist) + (setq ret t)) + (setq mylist (cdr mylist))) + ret + )) + + +(defun flymake-posn-at-point-as-event (&optional position window dx dy) + "Return pixel position of top left corner of glyph at POSITION, +relative to top left corner of WINDOW, as a mouse-1 click +event (identical to the event that would be triggered by clicking +mouse button 1 at the top left corner of the glyph). + +POSITION and WINDOW default to the position of point in the +selected window. + +DX and DY specify optional offsets from the top left of the glyph." + (unless window (setq window (selected-window))) + (unless position (setq position (window-point window))) + (unless dx (setq dx 0)) + (unless dy (setq dy 0)) + + (let* ((pos (posn-at-point position window)) + (x-y (posn-x-y pos)) + (edges (window-inside-pixel-edges window)) + (win-x-y (window-pixel-edges window))) + ;; adjust for window edges + (setcar (nthcdr 2 pos) + (cons (+ (car x-y) (car edges) (- (car win-x-y)) dx) + (+ (cdr x-y) (cadr edges) (- (cadr win-x-y)) dy))) + (list 'mouse-1 pos))) + +(defun flymake-popup-menu (menu-data) + "Pop up the flymake menu at point, using the data MENU-DATA. +POS is a list of the form ((X Y) WINDOW), where X and Y are +pixels positions from the top left corner of WINDOW's frame. +MENU-DATA is a list of error and warning messages returned by +`flymake-make-err-menu-data'." + (if (featurep 'xemacs) + (let* ((pos (flymake-get-point-pixel-pos)) + (x-pos (nth 0 pos)) + (y-pos (nth 1 pos)) + (fake-event-props '(button 1 x 1 y 1))) + (setq fake-event-props (plist-put fake-event-props 'x x-pos)) + (setq fake-event-props (plist-put fake-event-props 'y y-pos)) + (popup-menu (flymake-make-xemacs-menu menu-data) + (make-event 'button-press fake-event-props))) + (x-popup-menu (if (eval-when-compile (fboundp 'posn-at-point)) + (flymake-posn-at-point-as-event) + (list (flymake-get-point-pixel-pos) (selected-window))) + (flymake-make-emacs-menu menu-data)))) + +(defun flymake-make-emacs-menu (menu-data) + "Return a menu specifier using MENU-DATA. +MENU-DATA is a list of error and warning messages returned by +`flymake-make-err-menu-data'. +See `x-popup-menu' for the menu specifier format." + (let* ((menu-title (nth 0 menu-data)) + (menu-items (nth 1 menu-data)) + (menu-commands (mapcar (lambda (foo) + (cons (nth 0 foo) (nth 1 foo))) + menu-items))) + (list menu-title (cons "" menu-commands)))) + +(if (featurep 'xemacs) (progn + +(defun flymake-nop ()) + +(defun flymake-make-xemacs-menu (menu-data) + "Return a menu specifier using MENU-DATA." + (let* ((menu-title (nth 0 menu-data)) + (menu-items (nth 1 menu-data)) + (menu-commands nil)) + (setq menu-commands (mapcar (lambda (foo) + (vector (nth 0 foo) (or (nth 1 foo) '(flymake-nop)) t)) + menu-items)) + (cons menu-title menu-commands))) + +)) ;; xemacs + +(unless (eval-when-compile (fboundp 'posn-at-point)) + +(defun flymake-current-row () + "Return current row number in current frame." + (if (fboundp 'window-edges) + (+ (car (cdr (window-edges))) (count-lines (window-start) (point))) + (count-lines (window-start) (point)))) + +(defun flymake-selected-frame () + (if (fboundp 'window-edges) + (selected-frame) + (selected-window))) + +(defun flymake-get-point-pixel-pos () + "Return point position in pixels: (x, y)." + (let ((mouse-pos (mouse-position)) + (pixel-pos nil) + (ret nil)) + (if (car (cdr mouse-pos)) + (progn + (set-mouse-position (flymake-selected-frame) (current-column) (flymake-current-row)) + (setq pixel-pos (mouse-pixel-position)) + (set-mouse-position (car mouse-pos) (car (cdr mouse-pos)) (cdr (cdr mouse-pos))) + (setq ret (list (car (cdr pixel-pos)) (cdr (cdr pixel-pos))))) + (progn + (setq ret '(0 0)))) + (flymake-log 3 "mouse pos is %s" ret) + ret)) + +) ;; End of (unless (fboundp 'posn-at-point) + +;;;; ]] + +(defcustom flymake-log-level -1 + "Logging level, only messages with level lower or equal will be logged. +-1 = NONE, 0 = ERROR, 1 = WARNING, 2 = INFO, 3 = DEBUG" + :group 'flymake + :type 'integer) + +(defun flymake-log (level text &rest args) + "Log a message at level LEVEL. +If LEVEL is higher than `flymake-log-level', the message is +ignored. Otherwise, it is printed using `message'. +TEXT is a format control string, and the remaining arguments ARGS +are the string substitutions (see `format')." + (if (<= level flymake-log-level) + (let* ((msg (apply 'format text args))) + (message "%s" msg) + ;;XXX + (with-temp-buffer + (insert msg) + (insert "\n")) + ;; (flymake-save-buffer-in-file "d:/flymake.log" t) ; make log file name customizable + ;;) + ))) + +(defun flymake-ins-after (list pos val) + "Insert VAL into LIST after position POS." + (let ((tmp (copy-sequence list))) ; (???) + (setcdr (nthcdr pos tmp) (cons val (nthcdr (1+ pos) tmp))) + tmp)) + +(defun flymake-set-at (list pos val) + "Set VAL at position POS in LIST." + (let ((tmp (copy-sequence list))) ; (???) + (setcar (nthcdr pos tmp) val) + tmp)) + +(defvar flymake-processes nil + "List of currently active flymake processes.") + +(defvar flymake-output-residual nil) + +(make-variable-buffer-local 'flymake-output-residual) + +(defgroup flymake nil + "A universal on-the-fly syntax checker." + :version "23.1" + :group 'tools) + +(defcustom flymake-allowed-file-name-masks + '(("\\.c\\'" flymake-simple-make-init) + ("\\.cpp\\'" flymake-simple-make-init) + ("\\.xml\\'" flymake-xml-init) + ("\\.html?\\'" flymake-xml-init) + ("\\.cs\\'" flymake-simple-make-init) + ("\\.p[ml]\\'" flymake-perl-init) + ("\\.php[345]?\\'" flymake-php-init) + ("\\.h\\'" flymake-master-make-header-init flymake-master-cleanup) + ("\\.java\\'" flymake-simple-make-java-init flymake-simple-java-cleanup) + ("[0-9]+\\.tex\\'" flymake-master-tex-init flymake-master-cleanup) + ("\\.tex\\'" flymake-simple-tex-init) + ("\\.idl\\'" flymake-simple-make-init) + ;; ("\\.cpp\\'" 1) + ;; ("\\.java\\'" 3) + ;; ("\\.h\\'" 2 ("\\.cpp\\'" "\\.c\\'") + ;; ("[ \t]*#[ \t]*include[ \t]*\"\\([\w0-9/\\_\.]*[/\\]*\\)\\(%s\\)\"" 1 2)) + ;; ("\\.idl\\'" 1) + ;; ("\\.odl\\'" 1) + ;; ("[0-9]+\\.tex\\'" 2 ("\\.tex\\'") + ;; ("[ \t]*\\input[ \t]*{\\(.*\\)\\(%s\\)}" 1 2 )) + ;; ("\\.tex\\'" 1) + ) + "*Files syntax checking is allowed for." + :group 'flymake + :type '(repeat (string symbol symbol symbol))) + +(defun flymake-get-file-name-mode-and-masks (file-name) + "Return the corresponding entry from `flymake-allowed-file-name-masks'." + (unless (stringp file-name) + (error "Invalid file-name")) + (let ((fnm flymake-allowed-file-name-masks) + (mode-and-masks nil)) + (while (and (not mode-and-masks) fnm) + (if (string-match (car (car fnm)) file-name) + (setq mode-and-masks (cdr (car fnm)))) + (setq fnm (cdr fnm))) + (flymake-log 3 "file %s, init=%s" file-name (car mode-and-masks)) + mode-and-masks)) + +(defun flymake-can-syntax-check-file (file-name) + "Determine whether we can syntax check FILE-NAME. +Return nil if we cannot, non-nil if we can." + (if (flymake-get-init-function file-name) t nil)) + +(defun flymake-get-init-function (file-name) + "Return init function to be used for the file." + (let* ((init-f (nth 0 (flymake-get-file-name-mode-and-masks file-name)))) + ;;(flymake-log 0 "calling %s" init-f) + ;;(funcall init-f (current-buffer)) + init-f)) + +(defun flymake-get-cleanup-function (file-name) + "Return cleanup function to be used for the file." + (or (nth 1 (flymake-get-file-name-mode-and-masks file-name)) + 'flymake-simple-cleanup)) + +(defun flymake-get-real-file-name-function (file-name) + (or (nth 2 (flymake-get-file-name-mode-and-masks file-name)) + 'flymake-get-real-file-name)) + +(defvar flymake-find-buildfile-cache (flymake-makehash 'equal)) + +(defun flymake-get-buildfile-from-cache (dir-name) + (gethash dir-name flymake-find-buildfile-cache)) + +(defun flymake-add-buildfile-to-cache (dir-name buildfile) + (puthash dir-name buildfile flymake-find-buildfile-cache)) + +(defun flymake-clear-buildfile-cache () + (clrhash flymake-find-buildfile-cache)) + +(defun flymake-find-buildfile (buildfile-name source-dir-name) + "Find buildfile starting from current directory. +Buildfile includes Makefile, build.xml etc. +Return its file name if found, or nil if not found." + (or (flymake-get-buildfile-from-cache source-dir-name) + (let* ((file (locate-dominating-file source-dir-name buildfile-name))) + (if file + (progn + (flymake-log 3 "found buildfile at %s" file) + (flymake-add-buildfile-to-cache source-dir-name file) + file) + (progn + (flymake-log 3 "buildfile for %s not found" source-dir-name) + nil))))) + +(defun flymake-fix-file-name (name) + "Replace all occurrences of '\' with '/'." + (when name + (setq name (expand-file-name name)) + (setq name (abbreviate-file-name name)) + (setq name (directory-file-name name)) + name)) + +(defun flymake-same-files (file-name-one file-name-two) + "Check if FILE-NAME-ONE and FILE-NAME-TWO point to same file. +Return t if so, nil if not." + (equal (flymake-fix-file-name file-name-one) + (flymake-fix-file-name file-name-two))) + +(defcustom flymake-master-file-dirs '("." "./src" "./UnitTest") + "Dirs where to look for master files." + :group 'flymake + :type '(repeat (string))) + +(defcustom flymake-master-file-count-limit 32 + "Max number of master files to check." + :group 'flymake + :type 'integer) + +;; This is bound dynamically to pass a parameter to a sort predicate below +(defvar flymake-included-file-name) + +(defun flymake-find-possible-master-files (file-name master-file-dirs masks) + "Find (by name and location) all possible master files. +Master files are .cpp and .c for and .h. Files are searched for +starting from the .h directory and max max-level parent dirs. +File contents are not checked." + (let* ((dirs master-file-dirs) + (files nil) + (done nil)) + + (while (and (not done) dirs) + (let* ((dir (expand-file-name (car dirs) (file-name-directory file-name))) + (masks masks)) + (while (and (file-exists-p dir) (not done) masks) + (let* ((mask (car masks)) + (dir-files (directory-files dir t mask))) + + (flymake-log 3 "dir %s, %d file(s) for mask %s" + dir (length dir-files) mask) + (while (and (not done) dir-files) + (when (not (file-directory-p (car dir-files))) + (setq files (cons (car dir-files) files)) + (when (>= (length files) flymake-master-file-count-limit) + (flymake-log 3 "master file count limit (%d) reached" flymake-master-file-count-limit) + (setq done t))) + (setq dir-files (cdr dir-files)))) + (setq masks (cdr masks)))) + (setq dirs (cdr dirs))) + (when files + (let ((flymake-included-file-name (file-name-nondirectory file-name))) + (setq files (sort files 'flymake-master-file-compare)))) + (flymake-log 3 "found %d possible master file(s)" (length files)) + files)) + +(defun flymake-master-file-compare (file-one file-two) + "Compare two files specified by FILE-ONE and FILE-TWO. +This function is used in sort to move most possible file names +to the beginning of the list (File.h -> File.cpp moved to top)." + (and (equal (file-name-sans-extension flymake-included-file-name) + (file-name-sans-extension (file-name-nondirectory file-one))) + (not (equal file-one file-two)))) + +(defcustom flymake-check-file-limit 8192 + "Max number of chars to look at when checking possible master file." + :group 'flymake + :type 'integer) + +(defun flymake-check-patch-master-file-buffer + (master-file-temp-buffer + master-file-name patched-master-file-name + source-file-name patched-source-file-name + include-dirs regexp) + "Check if MASTER-FILE-NAME is a master file for SOURCE-FILE-NAME. +For .cpp master file this means it includes SOURCE-FILE-NAME (.h). +If yes, patch a copy of MASTER-FILE-NAME to include PATCHED-SOURCE-FILE-NAME +instead of SOURCE-FILE-NAME. +Whether a buffer for MATER-FILE-NAME exists, use it as a source +instead of reading master file from disk." + (let* ((source-file-nondir (file-name-nondirectory source-file-name)) + (found nil) + (inc-name nil) + (search-limit flymake-check-file-limit)) + (setq regexp + (format regexp ; "[ \t]*#[ \t]*include[ \t]*\"\\(.*%s\\)\"" + (regexp-quote source-file-nondir))) + (unwind-protect + (with-current-buffer master-file-temp-buffer + (when (> search-limit (point-max)) + (setq search-limit (point-max))) + (flymake-log 3 "checking %s against regexp %s" + master-file-name regexp) + (goto-char (point-min)) + (while (and (< (point) search-limit) + (re-search-forward regexp search-limit t)) + (let ((match-beg (match-beginning 1)) + (match-end (match-end 1))) + + (flymake-log 3 "found possible match for %s" source-file-nondir) + (setq inc-name (match-string 1)) + (when (eq t (compare-strings + source-file-nondir nil nil + inc-name (- (length inc-name) + (length source-file-nondir)) nil)) + (flymake-log 3 "inc-name=%s" inc-name) + (when (flymake-check-include source-file-name inc-name + include-dirs) + (setq found t) + ;; replace-match is not used here as it fails in + ;; XEmacs with 'last match not a buffer' error as + ;; check-includes calls replace-in-string + (flymake-replace-region + match-beg match-end + (file-name-nondirectory patched-source-file-name)))) + (forward-line 1))) + (when found + (flymake-save-buffer-in-file patched-master-file-name))) + ;;+(flymake-log 3 "killing buffer %s" + ;; (buffer-name master-file-temp-buffer)) + (kill-buffer master-file-temp-buffer)) + ;;+(flymake-log 3 "check-patch master file %s: %s" master-file-name found) + (when found + (flymake-log 2 "found master file %s" master-file-name)) + found)) + +(defun flymake-replace-region (beg end rep) + "Replace text in BUFFER in region (BEG END) with REP." + (save-excursion + (goto-char end) + ;; Insert before deleting, so as to better preserve markers's positions. + (insert rep) + (delete-region beg end))) + +(defun flymake-read-file-to-temp-buffer (file-name) + "Insert contents of FILE-NAME into newly created temp buffer." + (let* ((temp-buffer (get-buffer-create (generate-new-buffer-name (concat "flymake:" (file-name-nondirectory file-name)))))) + (with-current-buffer temp-buffer + (insert-file-contents file-name)) + temp-buffer)) + +(defun flymake-copy-buffer-to-temp-buffer (buffer) + "Copy contents of BUFFER into newly created temp buffer." + (with-current-buffer + (get-buffer-create (generate-new-buffer-name + (concat "flymake:" (buffer-name buffer)))) + (insert-buffer-substring buffer) + (current-buffer))) + +(defun flymake-check-include (source-file-name inc-name include-dirs) + "Check if SOURCE-FILE-NAME can be found in include path. +Return t if it can be found via include path using INC-NAME." + (if (file-name-absolute-p inc-name) + (flymake-same-files source-file-name inc-name) + (while (and include-dirs + (not (flymake-same-files + source-file-name + (concat (file-name-directory source-file-name) + "/" (car include-dirs) + "/" inc-name)))) + (setq include-dirs (cdr include-dirs))) + include-dirs)) + +(defun flymake-find-buffer-for-file (file-name) + "Check if there exists a buffer visiting FILE-NAME. +Return t if so, nil if not." + (let ((buffer-name (get-file-buffer file-name))) + (if buffer-name + (get-buffer buffer-name)))) + +(defun flymake-create-master-file (source-file-name patched-source-file-name get-incl-dirs-f create-temp-f masks include-regexp) + "Save SOURCE-FILE-NAME with a different name. +Find master file, patch and save it." + (let* ((possible-master-files (flymake-find-possible-master-files source-file-name flymake-master-file-dirs masks)) + (master-file-count (length possible-master-files)) + (idx 0) + (temp-buffer nil) + (master-file-name nil) + (patched-master-file-name nil) + (found nil)) + + (while (and (not found) (< idx master-file-count)) + (setq master-file-name (nth idx possible-master-files)) + (setq patched-master-file-name (funcall create-temp-f master-file-name "flymake_master")) + (if (flymake-find-buffer-for-file master-file-name) + (setq temp-buffer (flymake-copy-buffer-to-temp-buffer (flymake-find-buffer-for-file master-file-name))) + (setq temp-buffer (flymake-read-file-to-temp-buffer master-file-name))) + (setq found + (flymake-check-patch-master-file-buffer + temp-buffer + master-file-name + patched-master-file-name + source-file-name + patched-source-file-name + (funcall get-incl-dirs-f (file-name-directory master-file-name)) + include-regexp)) + (setq idx (1+ idx))) + (if found + (list master-file-name patched-master-file-name) + (progn + (flymake-log 3 "none of %d master file(s) checked includes %s" master-file-count + (file-name-nondirectory source-file-name)) + nil)))) + +(defun flymake-save-buffer-in-file (file-name) + (make-directory (file-name-directory file-name) 1) + (write-region nil nil file-name nil 566) + (flymake-log 3 "saved buffer %s in file %s" (buffer-name) file-name)) + +(defun flymake-save-string-to-file (file-name data) + "Save string DATA to file FILE-NAME." + (write-region data nil file-name nil 566)) + +(defun flymake-read-file-to-string (file-name) + "Read contents of file FILE-NAME and return as a string." + (with-temp-buffer + (insert-file-contents file-name) + (buffer-substring (point-min) (point-max)))) + +(defun flymake-process-filter (process output) + "Parse OUTPUT and highlight error lines. +It's flymake process filter." + (let ((source-buffer (process-buffer process))) + + (flymake-log 3 "received %d byte(s) of output from process %d" + (length output) (process-id process)) + (when (buffer-live-p source-buffer) + (with-current-buffer source-buffer + (flymake-parse-output-and-residual output))))) + +(defun flymake-process-sentinel (process event) + "Sentinel for syntax check buffers." + (when (memq (process-status process) '(signal exit)) + (let* ((exit-status (process-exit-status process)) + (command (process-command process)) + (source-buffer (process-buffer process)) + (cleanup-f (flymake-get-cleanup-function (buffer-file-name source-buffer)))) + + (flymake-log 2 "process %d exited with code %d" + (process-id process) exit-status) + (condition-case err + (progn + (flymake-log 3 "cleaning up using %s" cleanup-f) + (when (buffer-live-p source-buffer) + (with-current-buffer source-buffer + (funcall cleanup-f))) + + (delete-process process) + (setq flymake-processes (delq process flymake-processes)) + + (when (buffer-live-p source-buffer) + (with-current-buffer source-buffer + + (flymake-parse-residual) + (flymake-post-syntax-check exit-status command) + (setq flymake-is-running nil)))) + (error + (let ((err-str (format "Error in process sentinel for buffer %s: %s" + source-buffer (error-message-string err)))) + (flymake-log 0 err-str) + (with-current-buffer source-buffer + (setq flymake-is-running nil)))))))) + +(defun flymake-post-syntax-check (exit-status command) + (setq flymake-err-info flymake-new-err-info) + (setq flymake-new-err-info nil) + (setq flymake-err-info + (flymake-fix-line-numbers + flymake-err-info 1 (flymake-count-lines))) + (flymake-delete-own-overlays) + (flymake-highlight-err-lines flymake-err-info) + (let (err-count warn-count info-count) + (setq err-count (flymake-get-err-count flymake-err-info "e")) + (setq warn-count (flymake-get-err-count flymake-err-info "w")) + (setq info-count (flymake-get-err-count flymake-err-info "i")) + + (flymake-log 2 "%s: %d error(s), %d warning(s), %d info in %.2f second(s)" + (buffer-name) err-count warn-count info-count + (- (flymake-float-time) flymake-check-start-time)) + (setq flymake-check-start-time nil) + + (if (and (equal 0 err-count) (equal 0 warn-count) (equal 0 info-count)) + (if (equal 0 exit-status) + (flymake-report-status "" "") ; PASSED + (if (not flymake-check-was-interrupted) + (flymake-report-fatal-status "CFGERR" + (format "Configuration error has occured while running %s" command)) + (flymake-report-status nil ""))) ; "STOPPED" + (flymake-report-status (format "%d/%d/%d" err-count warn-count info-count) "")))) + +(defun flymake-parse-output-and-residual (output) + "Split OUTPUT into lines, merge in residual if necessary." + (let* ((buffer-residual flymake-output-residual) + (total-output (if buffer-residual (concat buffer-residual output) output)) + (lines-and-residual (flymake-split-output total-output)) + (lines (nth 0 lines-and-residual)) + (new-residual (nth 1 lines-and-residual))) + (setq flymake-output-residual new-residual) + (setq flymake-new-err-info + (flymake-parse-err-lines + flymake-new-err-info lines)))) + +(defun flymake-parse-residual () + "Parse residual if it's non empty." + (when flymake-output-residual + (setq flymake-new-err-info + (flymake-parse-err-lines + flymake-new-err-info + (list flymake-output-residual))) + (setq flymake-output-residual nil))) + +(defun flymake-er-make-er (line-no line-err-info-list) + (list line-no line-err-info-list)) + +(defun flymake-er-get-line (err-info) + (nth 0 err-info)) + +(defun flymake-er-get-line-err-info-list (err-info) + (nth 1 err-info)) + +(defstruct (flymake-ler + (:constructor nil) + (:constructor flymake-ler-make-ler (file line type text &optional full-file))) + file line type text full-file) + +(defun flymake-ler-set-file (line-err-info file) + (flymake-ler-make-ler file + (flymake-ler-line line-err-info) + (flymake-ler-type line-err-info) + (flymake-ler-text line-err-info) + (flymake-ler-full-file line-err-info))) + +(defun flymake-ler-set-full-file (line-err-info full-file) + (flymake-ler-make-ler (flymake-ler-file line-err-info) + (flymake-ler-line line-err-info) + (flymake-ler-type line-err-info) + (flymake-ler-text line-err-info) + full-file)) + +(defun flymake-ler-set-line (line-err-info line) + (flymake-ler-make-ler (flymake-ler-file line-err-info) + line + (flymake-ler-type line-err-info) + (flymake-ler-text line-err-info) + (flymake-ler-full-file line-err-info))) + +(defun flymake-get-line-err-count (line-err-info-list type) + "Return number of errors of specified TYPE. +Value of TYPE is \"e\", \"w\" or \"i\"." + (let* ((idx 0) + (count (length line-err-info-list)) + (err-count 0)) + + (while (< idx count) + (when (equal type (flymake-ler-type (nth idx line-err-info-list))) + (setq err-count (1+ err-count))) + (setq idx (1+ idx))) + err-count)) + +(defun flymake-get-err-count (err-info-list type) + "Return number of errors of specified TYPE for ERR-INFO-LIST." + (let* ((idx 0) + (count (length err-info-list)) + (err-count 0)) + (while (< idx count) + (setq err-count (+ err-count (flymake-get-line-err-count (nth 1 (nth idx err-info-list)) type))) + (setq idx (1+ idx))) + err-count)) + +(defun flymake-fix-line-numbers (err-info-list min-line max-line) + "Replace line numbers with fixed value. +If line-numbers is less than MIN-LINE, set line numbers to MIN-LINE. +If line numbers is greater than MAX-LINE, set line numbers to MAX-LINE. +The reason for this fix is because some compilers might report +line number outside the file being compiled." + (let* ((count (length err-info-list)) + (err-info nil) + (line 0)) + (while (> count 0) + (setq err-info (nth (1- count) err-info-list)) + (setq line (flymake-er-get-line err-info)) + (when (or (< line min-line) (> line max-line)) + (setq line (if (< line min-line) min-line max-line)) + (setq err-info-list (flymake-set-at err-info-list (1- count) + (flymake-er-make-er line + (flymake-er-get-line-err-info-list err-info))))) + (setq count (1- count)))) + err-info-list) + +(defun flymake-highlight-err-lines (err-info-list) + "Highlight error lines in BUFFER using info from ERR-INFO-LIST." + (save-excursion + (dolist (err err-info-list) + (flymake-highlight-line (car err) (nth 1 err))))) + +(defun flymake-overlay-p (ov) + "Determine whether overlay OV was created by flymake." + (and (overlayp ov) (overlay-get ov 'flymake-overlay))) + +(defun flymake-make-overlay (beg end tooltip-text face mouse-face) + "Allocate a flymake overlay in range BEG and END." + (when (not (flymake-region-has-flymake-overlays beg end)) + (let ((ov (make-overlay beg end nil t t))) + (overlay-put ov 'face face) + (overlay-put ov 'mouse-face mouse-face) + (overlay-put ov 'help-echo tooltip-text) + (overlay-put ov 'flymake-overlay t) + (overlay-put ov 'priority 100) + ;;+(flymake-log 3 "created overlay %s" ov) + ov) + (flymake-log 3 "created an overlay at (%d-%d)" beg end))) + +(defun flymake-delete-own-overlays () + "Delete all flymake overlays in BUFFER." + (dolist (ol (overlays-in (point-min) (point-max))) + (when (flymake-overlay-p ol) + (delete-overlay ol) + ;;+(flymake-log 3 "deleted overlay %s" ol) + ))) + +(defun flymake-region-has-flymake-overlays (beg end) + "Check if region specified by BEG and END has overlay. +Return t if it has at least one flymake overlay, nil if no overlay." + (let ((ov (overlays-in beg end)) + (has-flymake-overlays nil)) + (while (consp ov) + (when (flymake-overlay-p (car ov)) + (setq has-flymake-overlays t)) + (setq ov (cdr ov))) + has-flymake-overlays)) + +(defface flymake-errline + '((((class color) (background dark)) (:background "Firebrick4")) + (((class color) (background light)) (:background "LightPink")) + (t (:bold t))) + "Face used for marking error lines." + :group 'flymake) + +(defface flymake-warnline + '((((class color) (background dark)) (:background "DarkBlue")) + (((class color) (background light)) (:background "LightBlue2")) + (t (:bold t))) + "Face used for marking warning lines." + :group 'flymake) + +(defface flymake-infoline + '((((class color) (background dark)) (:background "DarkGreen")) + (((class color) (background light)) (:background "LightGreen")) + (t (:bold t))) + "Face used for marking warning lines." + :group 'flymake) + + +(defun flymake-highlight-line (line-no line-err-info-list) + "Highlight line LINE-NO in current buffer. +Perhaps use text from LINE-ERR-INFO-LIST to enhance highlighting." + (goto-char (point-min)) + (forward-line (1- line-no)) + (let* ((line-beg (flymake-line-beginning-position)) + (line-end (flymake-line-end-position)) + (beg line-beg) + (end line-end) + (tooltip-text (flymake-ler-text (nth 0 line-err-info-list))) + (face nil)) + + (goto-char line-beg) + (while (looking-at "[ \t]") + (forward-char)) + + (setq beg (point)) + + (goto-char line-end) + (while (and (looking-at "[ \t\r\n]") (> (point) 1)) + (backward-char)) + + (setq end (1+ (point))) + + (when (<= end beg) + (setq beg line-beg) + (setq end line-end)) + + (when (= end beg) + (goto-char end) + (forward-line) + (setq end (point))) + + (if (> (flymake-get-line-err-count line-err-info-list "e") 0) + (setq face 'flymake-errline) + (if (> (flymake-get-line-err-count line-err-info-list "w") 0) + (setq face 'flymake-warnline) + (setq face 'flymake-infoline))) + + (flymake-make-overlay beg end tooltip-text face nil))) + +(defun flymake-parse-err-lines (err-info-list lines) + "Parse err LINES, store info in ERR-INFO-LIST." + (let* ((count (length lines)) + (idx 0) + (line-err-info nil) + (real-file-name nil) + (source-file-name buffer-file-name) + (get-real-file-name-f (flymake-get-real-file-name-function source-file-name))) + + (while (< idx count) + (setq line-err-info (flymake-parse-line (nth idx lines))) + (when line-err-info + (setq real-file-name (funcall get-real-file-name-f + (flymake-ler-file line-err-info))) + (setq line-err-info (flymake-ler-set-full-file line-err-info real-file-name)) + + (when (flymake-same-files real-file-name source-file-name) + (setq line-err-info (flymake-ler-set-file line-err-info nil)) + (setq err-info-list (flymake-add-err-info err-info-list line-err-info)))) + (flymake-log 3 "parsed '%s', %s line-err-info" (nth idx lines) (if line-err-info "got" "no")) + (setq idx (1+ idx))) + err-info-list)) + +(defun flymake-split-output (output) + "Split OUTPUT into lines. +Return last one as residual if it does not end with newline char. +Returns ((LINES) RESIDUAL)." + (when (and output (> (length output) 0)) + (let* ((lines (flymake-split-string output "[\n\r]+")) + (complete (equal "\n" (char-to-string (aref output (1- (length output)))))) + (residual nil)) + (when (not complete) + (setq residual (car (last lines))) + (setq lines (butlast lines))) + (list lines residual)))) + +(defun flymake-reformat-err-line-patterns-from-compile-el (original-list) + "Grab error line patterns from ORIGINAL-LIST in compile.el format. +Convert it to flymake internal format." + (let* ((converted-list '())) + (dolist (item original-list) + (setq item (cdr item)) + (let ((regexp (nth 0 item)) + (file (nth 1 item)) + (line (nth 2 item)) + (col (nth 3 item))) + (if (consp file) (setq file (car file))) + (if (consp line) (setq line (car line))) + (if (consp col) (setq col (car col))) + + (when (not (functionp line)) + (setq converted-list (cons (list regexp file line col) converted-list))))) + converted-list)) + +(require 'compile) + +(defvar flymake-err-line-patterns ; regexp file-idx line-idx col-idx (optional) text-idx(optional), match-end to end of string is error text + (append + '( + ;; MS Visual C++ 6.0 + ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)) \: \\(\\(error\\|warning\\|fatal error\\) \\(C[0-9]+\\):[ \t\n]*\\(.+\\)\\)" + 1 3 nil 4) + ;; jikes + ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)\:\\([0-9]+\\)\:[0-9]+\:[0-9]+\:[0-9]+\: \\(\\(Error\\|Warning\\|Caution\\|Semantic Error\\):[ \t\n]*\\(.+\\)\\)" + 1 3 nil 4) + ;; MS midl + ("midl[ ]*:[ ]*\\(command line error .*\\)" + nil nil nil 1) + ;; MS C# + ("\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\),[0-9]+)\: \\(\\(error\\|warning\\|fatal error\\) \\(CS[0-9]+\\):[ \t\n]*\\(.+\\)\\)" + 1 3 nil 4) + ;; perl + ("\\(.*\\) at \\([^ \n]+\\) line \\([0-9]+\\)[,.\n]" 2 3 nil 1) + ;; PHP + ("\\(?:Parse\\|Fatal\\) error: \\(.*\\) in \\(.*\\) on line \\([0-9]+\\)" 2 3 nil 1) + ;; LaTeX warnings (fileless) ("\\(LaTeX \\(Warning\\|Error\\): .*\\) on input line \\([0-9]+\\)" 20 3 nil 1) + ;; ant/javac + (" *\\(\\[javac\\] *\\)?\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)\:\\([0-9]+\\)\:[ \t\n]*\\(.+\\)" + 2 4 nil 5)) + ;; compilation-error-regexp-alist) + (flymake-reformat-err-line-patterns-from-compile-el compilation-error-regexp-alist-alist)) + "Patterns for matching error/warning lines. Each pattern has the form +\(REGEXP FILE-IDX LINE-IDX COL-IDX ERR-TEXT-IDX). +Use `flymake-reformat-err-line-patterns-from-compile-el' to add patterns +from compile.el") + + +(defvar flymake-warn-line-regex + '( "^[wW]arning" ) + "Patterns for recognizing if the line is a warning") + +(defvar flymake-info-line-regex + '( "^[iI]nfo" ) + "Patterns for recognizing if the line is an info message") + +(defun flymake-parse-line (line) + "Parse LINE to see if it is an error or warning. +Return its components if so, nil otherwise." + (let ((raw-file-name nil) + (line-no 0) + (err-type "e") + (err-text nil) + (patterns flymake-err-line-patterns) + (matched nil)) + (while (and patterns (not matched)) + (when (string-match (car (car patterns)) line) + (let* ((file-idx (nth 1 (car patterns))) + (line-idx (nth 2 (car patterns)))) + + (setq raw-file-name (if file-idx (match-string file-idx line) nil)) + (setq line-no (if line-idx (string-to-number (match-string line-idx line)) 0)) + (setq err-text (if (> (length (car patterns)) 4) + (match-string (nth 4 (car patterns)) line) + (flymake-patch-err-text (substring line (match-end 0))))) + (or err-text (setq err-text "")) + ;; Matching for warnings + (when (and err-text (one-true (string-match-multi flymake-warn-line-regex err-text))) + (setq err-type "w")) + ;; Matching for info messages + (when (and err-text (one-true (string-match-multi flymake-info-line-regex err-text))) + (setq err-type "i")) + + (flymake-log 3 "parse line: type=%s file-idx=%s line-idx=%s file=%s line=%s text=%s" err-type file-idx line-idx + raw-file-name line-no err-text) + (setq matched t))) + (setq patterns (cdr patterns))) + (if matched + (flymake-ler-make-ler raw-file-name line-no err-type err-text) + ()))) + +(defun flymake-find-err-info (err-info-list line-no) + "Find (line-err-info-list pos) for specified LINE-NO." + (if err-info-list + (let* ((line-err-info-list nil) + (pos 0) + (count (length err-info-list))) + + (while (and (< pos count) (< (car (nth pos err-info-list)) line-no)) + (setq pos (1+ pos))) + (when (and (< pos count) (equal (car (nth pos err-info-list)) line-no)) + (setq line-err-info-list (flymake-er-get-line-err-info-list (nth pos err-info-list)))) + (list line-err-info-list pos)) + '(nil 0))) + +(defun flymake-line-err-info-is-less-or-equal (line-one line-two) + (or (string< (flymake-ler-type line-one) (flymake-ler-type line-two)) + (and (string= (flymake-ler-type line-one) (flymake-ler-type line-two)) + (not (flymake-ler-file line-one)) (flymake-ler-file line-two)) + (and (string= (flymake-ler-type line-one) (flymake-ler-type line-two)) + (or (and (flymake-ler-file line-one) (flymake-ler-file line-two)) + (and (not (flymake-ler-file line-one)) (not (flymake-ler-file line-two))))))) + +(defun flymake-add-line-err-info (line-err-info-list line-err-info) + "Update LINE-ERR-INFO-LIST with the error LINE-ERR-INFO. +For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'. +The new element is inserted in the proper position, according to +the predicate `flymake-line-err-info-is-less-or-equal'. +The updated value of LINE-ERR-INFO-LIST is returned." + (if (not line-err-info-list) + (list line-err-info) + (let* ((count (length line-err-info-list)) + (idx 0)) + (while (and (< idx count) (flymake-line-err-info-is-less-or-equal (nth idx line-err-info-list) line-err-info)) + (setq idx (1+ idx))) + (cond ((equal 0 idx) (setq line-err-info-list (cons line-err-info line-err-info-list))) + (t (setq line-err-info-list (flymake-ins-after line-err-info-list (1- idx) line-err-info)))) + line-err-info-list))) + +(defun flymake-add-err-info (err-info-list line-err-info) + "Update ERR-INFO-LIST with the error LINE-ERR-INFO, preserving sort order. +Returns the updated value of ERR-INFO-LIST. +For the format of ERR-INFO-LIST, see `flymake-err-info'. +For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'." + (let* ((line-no (if (flymake-ler-file line-err-info) 1 (flymake-ler-line line-err-info))) + (info-and-pos (flymake-find-err-info err-info-list line-no)) + (exists (car info-and-pos)) + (pos (nth 1 info-and-pos)) + (line-err-info-list nil) + (err-info nil)) + + (if exists + (setq line-err-info-list (flymake-er-get-line-err-info-list (car (nthcdr pos err-info-list))))) + (setq line-err-info-list (flymake-add-line-err-info line-err-info-list line-err-info)) + + (setq err-info (flymake-er-make-er line-no line-err-info-list)) + (cond (exists (setq err-info-list (flymake-set-at err-info-list pos err-info))) + ((equal 0 pos) (setq err-info-list (cons err-info err-info-list))) + (t (setq err-info-list (flymake-ins-after err-info-list (1- pos) err-info)))) + err-info-list)) + +(defun flymake-get-project-include-dirs-imp (basedir) + "Include dirs for the project current file belongs to." + (if (flymake-get-project-include-dirs-from-cache basedir) + (progn + (flymake-get-project-include-dirs-from-cache basedir)) + ;;else + (let* ((command-line (concat "make -C " + (shell-quote-argument basedir) + " DUMPVARS=INCLUDE_DIRS dumpvars")) + (output (shell-command-to-string command-line)) + (lines (flymake-split-string output "\n")) + (count (length lines)) + (idx 0) + (inc-dirs nil)) + (while (and (< idx count) (not (string-match "^INCLUDE_DIRS=.*" (nth idx lines)))) + (setq idx (1+ idx))) + (when (< idx count) + (let* ((inc-lines (flymake-split-string (nth idx lines) " *-I")) + (inc-count (length inc-lines))) + (while (> inc-count 0) + (when (not (string-match "^INCLUDE_DIRS=.*" (nth (1- inc-count) inc-lines))) + (push (flymake-replace-regexp-in-string "\"" "" (nth (1- inc-count) inc-lines)) inc-dirs)) + (setq inc-count (1- inc-count))))) + (flymake-add-project-include-dirs-to-cache basedir inc-dirs) + inc-dirs))) + +(defcustom flymake-get-project-include-dirs-function 'flymake-get-project-include-dirs-imp + "Function used to get project include dirs, one parameter: basedir name." + :group 'flymake + :type 'function) + +(defun flymake-get-project-include-dirs (basedir) + (funcall flymake-get-project-include-dirs-function basedir)) + +(defun flymake-get-system-include-dirs () + "System include dirs - from the 'INCLUDE' env setting." + (let* ((includes (getenv "INCLUDE"))) + (if includes (flymake-split-string includes path-separator) nil))) + +(defvar flymake-project-include-dirs-cache (flymake-makehash 'equal)) + +(defun flymake-get-project-include-dirs-from-cache (base-dir) + (gethash base-dir flymake-project-include-dirs-cache)) + +(defun flymake-add-project-include-dirs-to-cache (base-dir include-dirs) + (puthash base-dir include-dirs flymake-project-include-dirs-cache)) + +(defun flymake-clear-project-include-dirs-cache () + (clrhash flymake-project-include-dirs-cache)) + +(defun flymake-get-include-dirs (base-dir) + "Get dirs to use when resolving local file names." + (let* ((include-dirs (append '(".") (flymake-get-project-include-dirs base-dir) (flymake-get-system-include-dirs)))) + include-dirs)) + +;; (defun flymake-restore-formatting () +;; "Remove any formatting made by flymake." +;; ) + +;; (defun flymake-get-program-dir (buffer) +;; "Get dir to start program in." +;; (unless (bufferp buffer) +;; (error "Invalid buffer")) +;; (with-current-buffer buffer +;; default-directory)) + +(defun flymake-safe-delete-file (file-name) + (when (and file-name (file-exists-p file-name)) + (delete-file file-name) + (flymake-log 1 "deleted file %s" file-name))) + +(defun flymake-safe-delete-directory (dir-name) + (condition-case err + (progn + (delete-directory dir-name) + (flymake-log 1 "deleted dir %s" dir-name)) + (error + (flymake-log 1 "Failed to delete dir %s, error ignored" dir-name)))) + +(defcustom flymake-compilation-prevents-syntax-check t + "If non-nil, syntax check won't be started in case compilation is running." + :group 'flymake + :type 'boolean) + +(defun flymake-start-syntax-check () + "Start syntax checking for current buffer." + (interactive) + (flymake-log 3 "flymake is running: %s" flymake-is-running) + (when (and (not flymake-is-running) + (flymake-can-syntax-check-file buffer-file-name)) + (when (or (not flymake-compilation-prevents-syntax-check) + (not (flymake-compilation-is-running))) ;+ (flymake-rep-ort-status buffer "COMP") + (flymake-clear-buildfile-cache) + (flymake-clear-project-include-dirs-cache) + + (setq flymake-check-was-interrupted nil) + + (let* ((source-file-name buffer-file-name) + (init-f (flymake-get-init-function source-file-name)) + (cleanup-f (flymake-get-cleanup-function source-file-name)) + (cmd-and-args (funcall init-f)) + (cmd (nth 0 cmd-and-args)) + (args (nth 1 cmd-and-args)) + (dir (nth 2 cmd-and-args))) + (if (not cmd-and-args) + (progn + (flymake-log 0 "init function %s for %s failed, cleaning up" init-f source-file-name) + (funcall cleanup-f)) + (progn + (setq flymake-last-change-time nil) + (flymake-start-syntax-check-process cmd args dir))))))) + +(defun flymake-start-syntax-check-process (cmd args dir) + "Start syntax check process." + (let* ((process nil)) + (condition-case err + (progn + (when dir + (let ((default-directory dir)) + (flymake-log 3 "starting process on dir %s" default-directory))) + (setq process (apply 'start-process "flymake-proc" (current-buffer) cmd args)) + (set-process-sentinel process 'flymake-process-sentinel) + (set-process-filter process 'flymake-process-filter) + (push process flymake-processes) + + (setq flymake-is-running t) + (setq flymake-last-change-time nil) + (setq flymake-check-start-time (flymake-float-time)) + + (flymake-report-status nil "*") + (flymake-log 2 "started process %d, command=%s, dir=%s" + (process-id process) (process-command process) + default-directory) + process) + (error + (let* ((err-str (format "Failed to launch syntax check process '%s' with args %s: %s" + cmd args (error-message-string err))) + (source-file-name buffer-file-name) + (cleanup-f (flymake-get-cleanup-function source-file-name))) + (flymake-log 0 err-str) + (funcall cleanup-f) + (flymake-report-fatal-status "PROCERR" err-str)))))) + +(defun flymake-kill-process (proc) + "Kill process PROC." + (kill-process proc) + (let* ((buf (process-buffer proc))) + (when (buffer-live-p buf) + (with-current-buffer buf + (setq flymake-check-was-interrupted t)))) + (flymake-log 1 "killed process %d" (process-id proc))) + +(defun flymake-stop-all-syntax-checks () + "Kill all syntax check processes." + (interactive) + (while flymake-processes + (flymake-kill-process (pop flymake-processes)))) + +(defun flymake-compilation-is-running () + (and (boundp 'compilation-in-progress) + compilation-in-progress)) + +(defun flymake-compile () + "Kill all flymake syntax checks, start compilation." + (interactive) + (flymake-stop-all-syntax-checks) + (call-interactively 'compile)) + +(defcustom flymake-no-changes-timeout 0.5 + "Time to wait after last change before starting compilation." + :group 'flymake + :type 'number) + +(defun flymake-on-timer-event (buffer) + "Start a syntax check for buffer BUFFER if necessary." + (when (buffer-live-p buffer) + (with-current-buffer buffer + (when (and (not flymake-is-running) + flymake-last-change-time + (> (- (flymake-float-time) flymake-last-change-time) + flymake-no-changes-timeout)) + + (setq flymake-last-change-time nil) + (flymake-log 3 "starting syntax check as more than 1 second passed since last change") + (flymake-start-syntax-check))))) + +(defun flymake-current-line-no () + "Return number of current line in current buffer." + (count-lines (point-min) (if (eobp) (point) (1+ (point))))) + +(defun flymake-count-lines () + "Return number of lines in buffer BUFFER." + (count-lines (point-min) (point-max))) + +(defun flymake-display-err-menu-for-current-line () + "Display a menu with errors/warnings for current line if it has errors and/or warnings." + (interactive) + (let* ((line-no (flymake-current-line-no)) + (line-err-info-list (nth 0 (flymake-find-err-info flymake-err-info line-no))) + (menu-data (flymake-make-err-menu-data line-no line-err-info-list)) + (choice nil)) + (if menu-data + (progn + (setq choice (flymake-popup-menu menu-data)) + (flymake-log 3 "choice=%s" choice) + (when choice + (eval choice))) + (flymake-log 1 "no errors for line %d" line-no)))) + +(defun flymake-make-err-menu-data (line-no line-err-info-list) + "Make a (menu-title (item-title item-action)*) list with errors/warnings from LINE-ERR-INFO-LIST." + (let* ((menu-items nil)) + (when line-err-info-list + (let* ((count (length line-err-info-list)) + (menu-item-text nil)) + (while (> count 0) + (setq menu-item-text (flymake-ler-text (nth (1- count) line-err-info-list))) + (let* ((file (flymake-ler-file (nth (1- count) line-err-info-list))) + (full-file (flymake-ler-full-file (nth (1- count) line-err-info-list))) + (line (flymake-ler-line (nth (1- count) line-err-info-list)))) + (if file + (setq menu-item-text (concat menu-item-text " - " file "(" (format "%d" line) ")"))) + (setq menu-items (cons (list menu-item-text + (if file (list 'flymake-goto-file-and-line full-file line) nil)) + menu-items))) + (setq count (1- count))) + (flymake-log 3 "created menu-items with %d item(s)" (length menu-items)))) + (if menu-items + (let* ((menu-title (format "Line %d: %d error(s), %d warning(s)" line-no + (flymake-get-line-err-count line-err-info-list "e") + (flymake-get-line-err-count line-err-info-list "w")))) + (list menu-title menu-items)) + nil))) + +(defun flymake-goto-file-and-line (file line) + "Try to get buffer for FILE and goto line LINE in it." + (if (not (file-exists-p file)) + (flymake-log 1 "File %s does not exist" file) + (find-file file) + (goto-char (point-min)) + (forward-line (1- line)))) + +;; flymake minor mode declarations +(defvar flymake-mode-line nil) + +(make-variable-buffer-local 'flymake-mode-line) + +(defvar flymake-mode-line-e-w nil) + +(make-variable-buffer-local 'flymake-mode-line-e-w) + +(defvar flymake-mode-line-status nil) + +(make-variable-buffer-local 'flymake-mode-line-status) + +(defun flymake-report-status (e-w &optional status) + "Show status in mode line." + (when e-w + (setq flymake-mode-line-e-w e-w)) + (when status + (setq flymake-mode-line-status status)) + (let* ((mode-line " Flymake")) + (when (> (length flymake-mode-line-e-w) 0) + (setq mode-line (concat mode-line ":" flymake-mode-line-e-w))) + (setq mode-line (concat mode-line flymake-mode-line-status)) + (setq flymake-mode-line mode-line) + (force-mode-line-update))) + +(defun flymake-display-warning (warning) + "Display a warning to user." + (message-box warning)) + +(defcustom flymake-gui-warnings-enabled t + "Enables/disables GUI warnings." + :group 'flymake + :type 'boolean) + +(defun flymake-report-fatal-status (status warning) + "Display a warning and switch flymake mode off." + (when flymake-gui-warnings-enabled + (flymake-display-warning (format "Flymake: %s. Flymake will be switched OFF" warning)) + ) + (flymake-mode 0) + (flymake-log 0 "switched OFF Flymake mode for buffer %s due to fatal status %s, warning %s" + (buffer-name) status warning)) + +(defcustom flymake-start-syntax-check-on-find-file t + "Start syntax check on find file." + :group 'flymake + :type 'boolean) + +;;;###autoload +(define-minor-mode flymake-mode + "Minor mode to do on-the-fly syntax checking. +When called interactively, toggles the minor mode. +With arg, turn Flymake mode on if and only if arg is positive." + :group 'flymake :lighter flymake-mode-line + (cond + + ;; Turning the mode ON. + (flymake-mode + (if (not (flymake-can-syntax-check-file buffer-file-name)) + (flymake-log 2 "flymake cannot check syntax in buffer %s" (buffer-name)) + (add-hook 'after-change-functions 'flymake-after-change-function nil t) + (add-hook 'after-save-hook 'flymake-after-save-hook nil t) + (add-hook 'kill-buffer-hook 'flymake-kill-buffer-hook nil t) + ;;+(add-hook 'find-file-hook 'flymake-find-file-hook) + + (flymake-report-status "" "") + + (setq flymake-timer + (run-at-time nil 1 'flymake-on-timer-event (current-buffer))) + + (when flymake-start-syntax-check-on-find-file + (flymake-start-syntax-check)))) + + ;; Turning the mode OFF. + (t + (remove-hook 'after-change-functions 'flymake-after-change-function t) + (remove-hook 'after-save-hook 'flymake-after-save-hook t) + (remove-hook 'kill-buffer-hook 'flymake-kill-buffer-hook t) + ;;+(remove-hook 'find-file-hook (function flymake-find-file-hook) t) + + (flymake-delete-own-overlays) + + (when flymake-timer + (cancel-timer flymake-timer) + (setq flymake-timer nil)) + + (setq flymake-is-running nil)))) + +;;;###autoload +(defun flymake-mode-on () + "Turn flymake mode on." + (flymake-mode 1) + (flymake-log 1 "flymake mode turned ON for buffer %s" (buffer-name))) + +;;;###autoload +(defun flymake-mode-off () + "Turn flymake mode off." + (flymake-mode 0) + (flymake-log 1 "flymake mode turned OFF for buffer %s" (buffer-name))) + +(defcustom flymake-start-syntax-check-on-newline t + "Start syntax check if newline char was added/removed from the buffer." + :group 'flymake + :type 'boolean) + +(defun flymake-after-change-function (start stop len) + "Start syntax check for current buffer if it isn't already running." + ;;+(flymake-log 0 "setting change time to %s" (flymake-float-time)) + (let((new-text (buffer-substring start stop))) + (when (and flymake-start-syntax-check-on-newline (equal new-text "\n")) + (flymake-log 3 "starting syntax check as new-line has been seen") + (flymake-start-syntax-check)) + (setq flymake-last-change-time (flymake-float-time)))) + +(defun flymake-after-save-hook () + (if (local-variable-p 'flymake-mode (current-buffer)) ; (???) other way to determine whether flymake is active in buffer being saved? + (progn + (flymake-log 3 "starting syntax check as buffer was saved") + (flymake-start-syntax-check)))) ; no more mode 3. cannot start check if mode 3 (to temp copies) is active - (???) + +(defun flymake-kill-buffer-hook () + (when flymake-timer + (cancel-timer flymake-timer) + (setq flymake-timer nil))) + +(defun flymake-find-file-hook () + ;;+(when flymake-start-syntax-check-on-find-file + ;;+ (flymake-log 3 "starting syntax check on file open") + ;;+ (flymake-start-syntax-check) + ;;+) + (when (and (not (local-variable-p 'flymake-mode (current-buffer))) + (flymake-can-syntax-check-file buffer-file-name)) + (flymake-mode) + (flymake-log 3 "automatically turned ON flymake mode"))) + +(defun flymake-get-first-err-line-no (err-info-list) + "Return first line with error." + (when err-info-list + (flymake-er-get-line (car err-info-list)))) + +(defun flymake-get-last-err-line-no (err-info-list) + "Return last line with error." + (when err-info-list + (flymake-er-get-line (nth (1- (length err-info-list)) err-info-list)))) + +(defun flymake-get-next-err-line-no (err-info-list line-no) + "Return next line with error." + (when err-info-list + (let* ((count (length err-info-list)) + (idx 0)) + (while (and (< idx count) (>= line-no (flymake-er-get-line (nth idx err-info-list)))) + (setq idx (1+ idx))) + (if (< idx count) + (flymake-er-get-line (nth idx err-info-list)))))) + +(defun flymake-get-prev-err-line-no (err-info-list line-no) + "Return previous line with error." + (when err-info-list + (let* ((count (length err-info-list))) + (while (and (> count 0) (<= line-no (flymake-er-get-line (nth (1- count) err-info-list)))) + (setq count (1- count))) + (if (> count 0) + (flymake-er-get-line (nth (1- count) err-info-list)))))) + +(defun flymake-skip-whitespace () + "Move forward until non-whitespace is reached." + (while (looking-at "[ \t]") + (forward-char))) + +(defun flymake-goto-line (line-no) + "Go to line LINE-NO, then skip whitespace." + (goto-char (point-min)) + (forward-line (1- line-no)) + (flymake-skip-whitespace)) + +(defun flymake-goto-next-error () + "Go to next error in err ring." + (interactive) + (let ((line-no (flymake-get-next-err-line-no flymake-err-info (flymake-current-line-no)))) + (when (not line-no) + (setq line-no (flymake-get-first-err-line-no flymake-err-info)) + (flymake-log 1 "passed end of file")) + (if line-no + (flymake-goto-line line-no) + (flymake-log 1 "no errors in current buffer")))) + +(defun flymake-goto-prev-error () + "Go to previous error in err ring." + (interactive) + (let ((line-no (flymake-get-prev-err-line-no flymake-err-info (flymake-current-line-no)))) + (when (not line-no) + (setq line-no (flymake-get-last-err-line-no flymake-err-info)) + (flymake-log 1 "passed beginning of file")) + (if line-no + (flymake-goto-line line-no) + (flymake-log 1 "no errors in current buffer")))) + +(defun flymake-patch-err-text (string) + (if (string-match "^[\n\t :0-9]*\\(.*\\)$" string) + (match-string 1 string) + string)) + +;;;; general init-cleanup and helper routines +(defun flymake-create-temp-inplace (file-name prefix) + (unless (stringp file-name) + (error "Invalid file-name")) + (or prefix + (setq prefix "flymake")) + (let* ((temp-name (concat (file-name-sans-extension file-name) + "_" prefix + (and (file-name-extension file-name) + (concat "." (file-name-extension file-name)))))) + (flymake-log 3 "create-temp-inplace: file=%s temp=%s" file-name temp-name) + temp-name)) + +(defun flymake-create-temp-with-folder-structure (file-name prefix) + (unless (stringp file-name) + (error "Invalid file-name")) + + (let* ((dir (file-name-directory file-name)) + ;; Not sure what this slash-pos is all about, but I guess it's just + ;; trying to remove the leading / of absolute file names. + (slash-pos (string-match "/" dir)) + (temp-dir (expand-file-name (substring dir (1+ slash-pos)) + (flymake-get-temp-dir)))) + + (file-truename (expand-file-name (file-name-nondirectory file-name) + temp-dir)))) + +(defun flymake-delete-temp-directory (dir-name) + "Attempt to delete temp dir created by `flymake-create-temp-with-folder-structure', do not fail on error." + (let* ((temp-dir (flymake-get-temp-dir)) + (suffix (substring dir-name (1+ (length temp-dir))))) + + (while (> (length suffix) 0) + (setq suffix (directory-file-name suffix)) + ;;+(flymake-log 0 "suffix=%s" suffix) + (flymake-safe-delete-directory + (file-truename (expand-file-name suffix temp-dir))) + (setq suffix (file-name-directory suffix))))) + +(defvar flymake-temp-source-file-name nil) +(make-variable-buffer-local 'flymake-temp-source-file-name) + +(defvar flymake-master-file-name nil) +(make-variable-buffer-local 'flymake-master-file-name) + +(defvar flymake-temp-master-file-name nil) +(make-variable-buffer-local 'flymake-temp-master-file-name) + +(defvar flymake-base-dir nil) +(make-variable-buffer-local 'flymake-base-dir) + +(defun flymake-init-create-temp-buffer-copy (create-temp-f) + "Make a temporary copy of the current buffer, save its name in buffer data and return the name." + (let* ((source-file-name buffer-file-name) + (temp-source-file-name (funcall create-temp-f source-file-name "flymake"))) + + (flymake-save-buffer-in-file temp-source-file-name) + (setq flymake-temp-source-file-name temp-source-file-name) + temp-source-file-name)) + +(defun flymake-simple-cleanup () + "Do cleanup after `flymake-init-create-temp-buffer-copy'. +Delete temp file." + (flymake-safe-delete-file flymake-temp-source-file-name) + (setq flymake-last-change-time nil)) + +(defun flymake-get-real-file-name (file-name-from-err-msg) + "Translate file name from error message to \"real\" file name. +Return full-name. Names are real, not patched." + (let* ((real-name nil) + (source-file-name buffer-file-name) + (master-file-name flymake-master-file-name) + (temp-source-file-name flymake-temp-source-file-name) + (temp-master-file-name flymake-temp-master-file-name) + (base-dirs + (list flymake-base-dir + (file-name-directory source-file-name) + (if master-file-name (file-name-directory master-file-name)))) + (files (list (list source-file-name source-file-name) + (list temp-source-file-name source-file-name) + (list master-file-name master-file-name) + (list temp-master-file-name master-file-name)))) + + (when (equal 0 (length file-name-from-err-msg)) + (setq file-name-from-err-msg source-file-name)) + + (setq real-name (flymake-get-full-patched-file-name file-name-from-err-msg base-dirs files)) + ;; if real-name is nil, than file name from err msg is none of the files we've patched + (if (not real-name) + (setq real-name (flymake-get-full-nonpatched-file-name file-name-from-err-msg base-dirs))) + (if (not real-name) + (setq real-name file-name-from-err-msg)) + (setq real-name (flymake-fix-file-name real-name)) + (flymake-log 3 "get-real-file-name: file-name=%s real-name=%s" file-name-from-err-msg real-name) + real-name)) + +(defun flymake-get-full-patched-file-name (file-name-from-err-msg base-dirs files) + (let* ((base-dirs-count (length base-dirs)) + (file-count (length files)) + (real-name nil)) + + (while (and (not real-name) (> base-dirs-count 0)) + (setq file-count (length files)) + (while (and (not real-name) (> file-count 0)) + (let* ((this-dir (nth (1- base-dirs-count) base-dirs)) + (this-file (nth 0 (nth (1- file-count) files))) + (this-real-name (nth 1 (nth (1- file-count) files)))) + ;;+(flymake-log 0 "this-dir=%s this-file=%s this-real=%s msg-file=%s" this-dir this-file this-real-name file-name-from-err-msg) + (when (and this-dir this-file (flymake-same-files + (expand-file-name file-name-from-err-msg this-dir) + this-file)) + (setq real-name this-real-name))) + (setq file-count (1- file-count))) + (setq base-dirs-count (1- base-dirs-count))) + real-name)) + +(defun flymake-get-full-nonpatched-file-name (file-name-from-err-msg base-dirs) + (let* ((real-name nil)) + (if (file-name-absolute-p file-name-from-err-msg) + (setq real-name file-name-from-err-msg) + (let* ((base-dirs-count (length base-dirs))) + (while (and (not real-name) (> base-dirs-count 0)) + (let* ((full-name (expand-file-name file-name-from-err-msg + (nth (1- base-dirs-count) base-dirs)))) + (if (file-exists-p full-name) + (setq real-name full-name)) + (setq base-dirs-count (1- base-dirs-count)))))) + real-name)) + +(defun flymake-init-find-buildfile-dir (source-file-name buildfile-name) + "Find buildfile, store its dir in buffer data and return its dir, if found." + (let* ((buildfile-dir + (flymake-find-buildfile buildfile-name + (file-name-directory source-file-name)))) + (if buildfile-dir + (setq flymake-base-dir buildfile-dir) + (flymake-log 1 "no buildfile (%s) for %s" buildfile-name source-file-name) + (flymake-report-fatal-status + "NOMK" (format "No buildfile (%s) found for %s" + buildfile-name source-file-name))))) + +(defun flymake-init-create-temp-source-and-master-buffer-copy (get-incl-dirs-f create-temp-f master-file-masks include-regexp) + "Find master file (or buffer), create its copy along with a copy of the source file." + (let* ((source-file-name buffer-file-name) + (temp-source-file-name (flymake-init-create-temp-buffer-copy create-temp-f)) + (master-and-temp-master (flymake-create-master-file + source-file-name temp-source-file-name + get-incl-dirs-f create-temp-f + master-file-masks include-regexp))) + + (if (not master-and-temp-master) + (progn + (flymake-log 1 "cannot find master file for %s" source-file-name) + (flymake-report-status "!" "") ; NOMASTER + nil) + (setq flymake-master-file-name (nth 0 master-and-temp-master)) + (setq flymake-temp-master-file-name (nth 1 master-and-temp-master))))) + +(defun flymake-master-cleanup () + (flymake-simple-cleanup) + (flymake-safe-delete-file flymake-temp-master-file-name)) + +;;;; make-specific init-cleanup routines +(defun flymake-get-syntax-check-program-args (source-file-name base-dir use-relative-base-dir use-relative-source get-cmd-line-f) + "Create a command line for syntax check using GET-CMD-LINE-F." + (funcall get-cmd-line-f + (if use-relative-source + (file-relative-name source-file-name base-dir) + source-file-name) + (if use-relative-base-dir + (file-relative-name base-dir + (file-name-directory source-file-name)) + base-dir))) + +(defun flymake-get-make-cmdline (source base-dir) + (list "make" + (list "-s" + "-C" + base-dir + (concat "CHK_SOURCES=" source) + "SYNTAX_CHECK_MODE=1" + "check-syntax"))) + +(defun flymake-get-ant-cmdline (source base-dir) + (list "ant" + (list "-buildfile" + (concat base-dir "/" "build.xml") + (concat "-DCHK_SOURCES=" source) + "check-syntax"))) + +(defun flymake-simple-make-init-impl (create-temp-f use-relative-base-dir use-relative-source build-file-name get-cmdline-f) + "Create syntax check command line for a directly checked source file. +Use CREATE-TEMP-F for creating temp copy." + (let* ((args nil) + (source-file-name buffer-file-name) + (buildfile-dir (flymake-init-find-buildfile-dir source-file-name build-file-name))) + (if buildfile-dir + (let* ((temp-source-file-name (flymake-init-create-temp-buffer-copy create-temp-f))) + (setq args (flymake-get-syntax-check-program-args temp-source-file-name buildfile-dir + use-relative-base-dir use-relative-source + get-cmdline-f)))) + args)) + +(defun flymake-simple-make-init () + (flymake-simple-make-init-impl 'flymake-create-temp-inplace t t "Makefile" 'flymake-get-make-cmdline)) + +(defun flymake-master-make-init (get-incl-dirs-f master-file-masks include-regexp) + "Create make command line for a source file checked via master file compilation." + (let* ((make-args nil) + (temp-master-file-name (flymake-init-create-temp-source-and-master-buffer-copy + get-incl-dirs-f 'flymake-create-temp-inplace + master-file-masks include-regexp))) + (when temp-master-file-name + (let* ((buildfile-dir (flymake-init-find-buildfile-dir temp-master-file-name "Makefile"))) + (if buildfile-dir + (setq make-args (flymake-get-syntax-check-program-args + temp-master-file-name buildfile-dir nil nil 'flymake-get-make-cmdline))))) + make-args)) + +(defun flymake-find-make-buildfile (source-dir) + (flymake-find-buildfile "Makefile" source-dir)) + +;;;; .h/make specific +(defun flymake-master-make-header-init () + (flymake-master-make-init 'flymake-get-include-dirs + '("\\.cpp\\'" "\\.c\\'") + "[ \t]*#[ \t]*include[ \t]*\"\\([[:word:]0-9/\\_.]*%s\\)\"")) + +;;;; .java/make specific +(defun flymake-simple-make-java-init () + (flymake-simple-make-init-impl 'flymake-create-temp-with-folder-structure nil nil "Makefile" 'flymake-get-make-cmdline)) + +(defun flymake-simple-ant-java-init () + (flymake-simple-make-init-impl 'flymake-create-temp-with-folder-structure nil nil "build.xml" 'flymake-get-ant-cmdline)) + +(defun flymake-simple-java-cleanup () + "Cleanup after `flymake-simple-make-java-init' -- delete temp file and dirs." + (flymake-safe-delete-file flymake-temp-source-file-name) + (when flymake-temp-source-file-name + (flymake-delete-temp-directory + (file-name-directory flymake-temp-source-file-name)))) + +;;;; perl-specific init-cleanup routines +(defun flymake-perl-init () + (let* ((temp-file (flymake-init-create-temp-buffer-copy + 'flymake-create-temp-inplace)) + (local-file (file-relative-name + temp-file + (file-name-directory buffer-file-name)))) + (list "perl" (list "-wc " local-file)))) + +;;;; php-specific init-cleanup routines +(defun flymake-php-init () + (let* ((temp-file (flymake-init-create-temp-buffer-copy + 'flymake-create-temp-inplace)) + (local-file (file-relative-name + temp-file + (file-name-directory buffer-file-name)))) + (list "php" (list "-f" local-file "-l")))) + +;;;; tex-specific init-cleanup routines +(defun flymake-get-tex-args (file-name) + ;;(list "latex" (list "-c-style-errors" file-name)) + (list "texify" (list "--pdf" "--tex-option=-c-style-errors" file-name))) + +(defun flymake-simple-tex-init () + (flymake-get-tex-args (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace))) + +(defun flymake-master-tex-init () + (let* ((temp-master-file-name (flymake-init-create-temp-source-and-master-buffer-copy + 'flymake-get-include-dirs-dot 'flymake-create-temp-inplace + '("\\.tex\\'") + "[ \t]*\\input[ \t]*{\\(.*%s\\)}"))) + (when temp-master-file-name + (flymake-get-tex-args temp-master-file-name)))) + +(defun flymake-get-include-dirs-dot (base-dir) + '(".")) + +;;;; xml-specific init-cleanup routines +(defun flymake-xml-init () + (list "xmlstarlet" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace)))) + +(provide 'flymake) + +;; arch-tag: 8f0d6090-061d-4cac-8862-7c151c4a02dd +;;; flymake.el ends here diff --git a/extensions/pymacs.el b/extensions/pymacs.el new file mode 100644 index 000000000..25d347a75 --- /dev/null +++ b/extensions/pymacs.el @@ -0,0 +1,813 @@ +;;; pymacs.el --- Interface between Emacs Lisp and Python + +;; Copyright © 2001, 2002, 2003, 2012 Progiciels Bourbeau-Pinard inc. + +;; Author: François Pinard +;; Maintainer: François Pinard +;; Created: 2001 +;; Version: 0.25 +;; Keywords: Python interface protocol + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. +;; +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with this program; if not, write to the Free Software Foundation, +;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +;;; Commentary: + +;; Pymacs is a powerful tool which, once started from Emacs, allows +;; both-way communication between Emacs Lisp and Python. Pymacs aims +;; Python as an extension language for Emacs rather than the other way +;; around. Visit http://pymacs.progiciels-bpi.ca to read its manual, +;; which also contains installation instructions. + +;;; Code: + +;; The code is organized into pages, grouping declarations by topic. +;; Such pages are introduced by a form feed and a topic description. + +;;; Portability stunts. + +(defvar pymacs-use-hash-tables + (and (fboundp 'make-hash-table) (fboundp 'gethash) (fboundp 'puthash)) + "Set to t if hash tables are available.") + +(eval-and-compile + + ;; pymacs-cancel-timer + (defalias 'pymacs-cancel-timer + (cond ((fboundp 'cancel-timer) 'cancel-timer) + ;; XEmacs case - yet having post-gc-hook, this is unused. + ((fboundp 'delete-itimer) 'delete-itimer) + (t 'ignore))) + + ;; pymacs-kill-without-query + (if (fboundp 'set-process-query-on-exit-flag) + (defun pymacs-kill-without-query (process) + "Tell recent Emacs how to quickly destroy PROCESS while exiting." + (set-process-query-on-exit-flag process nil)) + (defalias 'pymacs-kill-without-query + (if (fboundp 'process-kill-without-query-process) + 'process-kill-without-query-process + 'ignore))) + + ;; pymacs-multibyte-string-p + (cond ((fboundp 'multibyte-string-p) + (defalias 'pymacs-multibyte-string-p 'multibyte-string-p)) + ((fboundp 'find-charset-string) + (defun pymacs-multibyte-string-p (string) + "Tell XEmacs if STRING should be handled as multibyte." + (not (member (find-charset-string string) '(nil (ascii)))))) + (t + ;; Tell XEmacs that STRING is unibyte, when Mule is not around! + (defalias 'pymacs-multibyte-string-p 'ignore))) + + ;; pymacs-report-error + (defalias 'pymacs-report-error (symbol-function 'error)) + + ;; pymacs-set-buffer-multibyte + (if (fboundp 'set-buffer-multibyte) + (defalias 'pymacs-set-buffer-multibyte 'set-buffer-multibyte) + (defun pymacs-set-buffer-multibyte (flag) + "For use in Emacs 20.2 or earlier. Under XEmacs: no operation." + (setq enable-multibyte-characters flag))) + + ;; pymacs-timerp + (defalias 'pymacs-timerp + (cond ((fboundp 'timerp) 'timerp) + ;; XEmacs case - yet having post-gc-hook, this is unused. + ((fboundp 'itimerp) 'itimerp) + (t 'ignore))) + + ) + +;;; Published variables and functions. + +(defvar pymacs-python-command "python" + "Shell command used to start Python interpreter.") + +(defvar pymacs-load-path nil + "List of additional directories to search for Python modules. +The directories listed will be searched first, in the order given.") + +(defvar pymacs-trace-transit '(5000 . 30000) + "Keep the communication buffer growing, for debugging. +When this variable is nil, the `*Pymacs*' communication buffer gets erased +before each communication round-trip. Setting it to `t' guarantees that +the full communication is saved, which is useful for debugging. +It could also be given as (KEEP . LIMIT): whenever the buffer exceeds LIMIT +bytes, it is reduced to approximately KEEP bytes.") + +(defvar pymacs-forget-mutability nil + "Transmit copies to Python instead of Lisp handles, as much as possible. +When this variable is nil, most mutable objects are transmitted as handles. +This variable is meant to be temporarily rebound to force copies.") + +(defvar pymacs-mutable-strings nil + "Prefer transmitting Lisp strings to Python as handles. +When this variable is nil, strings are transmitted as copies, and the +Python side thus has no way for modifying the original Lisp strings. +This variable is ignored whenever `forget-mutability' is set.") + +(defvar pymacs-timeout-at-start 30 + "Maximum reasonable time, in seconds, for starting the Pymacs helper. +A machine should be pretty loaded before one needs to increment this.") + +(defvar pymacs-timeout-at-reply 5 + "Expected maximum time, in seconds, to get the first line of a reply. +The status of the Pymacs helper is checked at every such timeout.") + +(defvar pymacs-timeout-at-line 2 + "Expected maximum time, in seconds, to get another line of a reply. +The status of the Pymacs helper is checked at every such timeout.") + +(defvar pymacs-auto-restart 'ask + "Should the Pymacs helper be restarted whenever it dies? +Possible values are nil, t or ask.") + +(defvar pymacs-dreadful-zombies nil + "If zombies should trigger hard errors, whenever they get called. +If `nil', calling a zombie will merely produce a diagnostic message.") + +;;;###autoload +(defun pymacs-load (module &optional prefix noerror) + "Import the Python module named MODULE into Emacs. +Each function in the Python module is made available as an Emacs function. +The Lisp name of each function is the concatenation of PREFIX with +the Python name, in which underlines are replaced by dashes. If PREFIX is +not given, it defaults to MODULE followed by a dash. +If NOERROR is not nil, do not raise error when the module is not found." + (interactive + (let* ((module (read-string "Python module? ")) + (default (concat (car (last (split-string module "\\."))) "-")) + (prefix (read-string (format "Prefix? [%s] " default) + nil nil default))) + (list module prefix))) + (message "Pymacs loading %s..." module) + (let ((lisp-code (pymacs-call "pymacs_load_helper" module prefix))) + (cond (lisp-code (let ((result (eval lisp-code))) + (message "Pymacs loading %s...done" module) + result)) + (noerror (message "Pymacs loading %s...failed" module) nil) + (t (pymacs-report-error "Pymacs loading %s...failed" module))))) + +;;;###autoload +(defun pymacs-autoload (function module &optional prefix docstring interactive) + "Pymacs's equivalent of the standard emacs facility `autoload'. +Define FUNCTION to autoload from Python MODULE using PREFIX. +If PREFIX is not given, it defaults to MODULE followed by a dash. +Optional DOCSTRING documents FUNCTION until it gets loaded. +INTERACTIVE is normally the argument to the function `interactive', +t means `interactive' without arguments, nil means not interactive, +which is the default." + (unless (symbolp function) + (error "`%s' should be a symbol" function)) + (unless (stringp module) + (error "`%s' should be a string" module)) + (unless (pymacs-python-reference function) + + (defalias function + `(lambda (&rest args) + ,(or docstring + (format "Function `%s' to be loaded from Python module `%s'" + function module)) + ,(cond ((eq interactive t) '(interactive)) + (interactive `(interactive ,interactive))) + (pymacs-load ,module ,prefix) + (unless (pymacs-python-reference ',function) + (error "Pymacs autoload failed to define function %s" ',function)) + (apply ',function args))))) + +;;;###autoload +(defun pymacs-eval (text) + "Compile TEXT as a Python expression, and return its value." + (interactive "sPython expression? ") + (let ((value (pymacs-serve-until-reply "eval" `(princ ,text)))) + (when (interactive-p) + (message "%S" value)) + value)) + +;;;###autoload +(defun pymacs-exec (text) + "Compile and execute TEXT as a sequence of Python statements. +This functionality is experimental, and does not appear to be useful." + (interactive "sPython statements? ") + (let ((value (pymacs-serve-until-reply "exec" `(princ ,text)))) + (when (interactive-p) + (message "%S" value)) + value)) + +;;;###autoload +(defun pymacs-call (function &rest arguments) + "Return the result of calling a Python function FUNCTION over ARGUMENTS. +FUNCTION is a string denoting the Python function, ARGUMENTS are separate +Lisp expressions, one per argument. Immutable Lisp constants are converted +to Python equivalents, other structures are converted into Lisp handles." + (pymacs-serve-until-reply + "eval" `(pymacs-print-for-apply ',function ',arguments))) + +;;;###autoload +(defun pymacs-apply (function arguments) + "Return the result of calling a Python function FUNCTION over ARGUMENTS. +FUNCTION is a string denoting the Python function, ARGUMENTS is a list of +Lisp expressions. Immutable Lisp constants are converted to Python +equivalents, other structures are converted into Lisp handles." + (pymacs-serve-until-reply + "eval" `(pymacs-print-for-apply ',function ',arguments))) + +;;; Integration details. + +;; This page tries to increase the integration seamlessness of Pymacs +;; with the reminder of Emacs. + +;; Module "desktop" savagely kills `*Pymacs*' in some circumstances. +;; Let's avoid such damage. + +(eval-after-load 'desktop + '(push "\\*Pymacs\\*" desktop-clear-preserve-buffers)) + +;; Python functions and modules should ideally look like Lisp +;; functions and modules. + +(when t + + (defadvice documentation (around pymacs-ad-documentation activate) + ;; Integration of doc-strings. + (let* ((reference (pymacs-python-reference function)) + (python-doc (when reference + (pymacs-eval (format "doc_string(%s)" reference))))) + (if (or reference python-doc) + (setq ad-return-value + (concat + "It interfaces to a Python function.\n\n" + (when python-doc + (if raw python-doc (substitute-command-keys python-doc))))) + ad-do-it)))) + +(defun pymacs-python-reference (object) + ;; Return the text reference of a Python object if possible, else nil. + (when (functionp object) + (let* ((definition (indirect-function object)) + (body (and (pymacs-proper-list-p definition) + (> (length definition) 2) + (eq (car definition) 'lambda) + (cddr definition)))) + (when (and body (listp (car body)) (eq (caar body) 'interactive)) + ;; Skip the interactive specification of a function. + (setq body (cdr body))) + (when (and body + ;; Advised functions start with a string. + (not (stringp (car body))) + ;; Python trampolines hold exactly one expression. + (= (length body) 1)) + (let ((expression (car body))) + ;; EXPRESSION might now hold something like: + ;; (pymacs-apply (quote (pymacs-python . N)) ARGUMENT-LIST) + (when (and (pymacs-proper-list-p expression) + (= (length expression) 3) + (eq (car expression) 'pymacs-apply) + (eq (car (cadr expression)) 'quote)) + (setq object (cadr (cadr expression)))))))) + (when (eq (car-safe object) 'pymacs-python) + (format "python[%d]" (cdr object)))) + +;; The following functions are experimental -- they are not satisfactory yet. + +(defun pymacs-file-handler (operation &rest arguments) + ;; Integration of load-file, autoload, etc. + ;; Emacs might want the contents of some `MODULE.el' which does not exist, + ;; while there is a `MODULE.py' or `MODULE.pyc' file in the same directory. + ;; The goal is to generate a virtual contents for this `MODULE.el' file, as + ;; a set of Lisp trampoline functions to the Python module functions. + ;; Python modules can then be loaded or autoloaded as if they were Lisp. + (cond ((and (eq operation 'file-readable-p) + (let ((module (substring (car arguments) 0 -3))) + (or (pymacs-file-force operation arguments) + (file-readable-p (concat module ".py")) + (file-readable-p (concat module ".pyc")))))) + ((and (eq operation 'load) + (not (pymacs-file-force + 'file-readable-p (list (car arguments)))) + (file-readable-p (car arguments))) + (let ((lisp-code (pymacs-call "pymacs_load_helper" + (substring (car arguments) 0 -3) + nil))) + (unless lisp-code + (pymacs-report-error "Python import error")) + (eval lisp-code))) + ((and (eq operation 'insert-file-contents) + (not (pymacs-file-force + 'file-readable-p (list (car arguments)))) + (file-readable-p (car arguments))) + (let ((lisp-code (pymacs-call "pymacs_load_helper" + (substring (car arguments) 0 -3) + nil))) + (unless lisp-code + (pymacs-report-error "Python import error")) + (insert (prin1-to-string lisp-code)))) + (t (pymacs-file-force operation arguments)))) + +(defun pymacs-file-force (operation arguments) + ;; Bypass the file handler. + (let ((inhibit-file-name-handlers + (cons 'pymacs-file-handler + (and (eq inhibit-file-name-operation operation) + inhibit-file-name-handlers))) + (inhibit-file-name-operation operation)) + (apply operation arguments))) + +;;(add-to-list 'file-name-handler-alist '("\\.el\\'" . pymacs-file-handler)) + +;;; Gargabe collection of Python IDs. + +;; Python objects which have no Lisp representation are allocated on the +;; Python side as `python[INDEX]', and INDEX is transmitted to Emacs, with +;; the value to use on the Lisp side for it. Whenever Lisp does not need a +;; Python object anymore, it should be freed on the Python side. The +;; following variables and functions are meant to fill this duty. + +(defvar pymacs-used-ids nil + "List of received IDs, currently allocated on the Python side.") + +;; This is set whenever the Pymacs helper successfully starts, and is +;; also used to later detect the death of a previous helper. If +;; pymacs-use-hash-tables is unset, this variable receives `t' when +;; the helper starts, so the detection works nevertheless. +(defvar pymacs-weak-hash nil + "Weak hash table, meant to find out which IDs are still needed.") + +(defvar pymacs-gc-wanted nil + "Flag that it is desirable to clean up unused IDs on the Python side.") + +(defvar pymacs-gc-inhibit nil + "Flag that a new Pymacs garbage collection should just not run now.") + +(defvar pymacs-gc-timer nil + "Timer to trigger Pymacs garbage collection at regular time intervals. +The timer is used only if `post-gc-hook' is not available.") + +(defun pymacs-schedule-gc (&optional xemacs-list) + (unless pymacs-gc-inhibit + (setq pymacs-gc-wanted t))) + +(defun pymacs-garbage-collect () + ;; Clean up unused IDs on the Python side. + (when (and pymacs-use-hash-tables (not pymacs-gc-inhibit)) + (let ((pymacs-gc-inhibit t) + (pymacs-forget-mutability t) + (ids pymacs-used-ids) + used-ids unused-ids) + (while ids + (let ((id (car ids))) + (setq ids (cdr ids)) + (if (gethash id pymacs-weak-hash) + (setq used-ids (cons id used-ids)) + (setq unused-ids (cons id unused-ids))))) + (setq pymacs-used-ids used-ids + pymacs-gc-wanted nil) + (when unused-ids + (let ((pymacs-forget-mutability t)) + (pymacs-call "free_python" unused-ids)))))) + +(defun pymacs-defuns (arguments) + ;; Take one argument, a list holding a number of items divisible by 3. The + ;; first argument is an INDEX, the second is a NAME, the third is the + ;; INTERACTION specification, and so forth. Register Python INDEX with a + ;; function with that NAME and INTERACTION on the Lisp side. The strange + ;; calling convention is to minimise quoting at call time. + (while (>= (length arguments) 3) + (let ((index (nth 0 arguments)) + (name (nth 1 arguments)) + (interaction (nth 2 arguments))) + (fset name (pymacs-defun index interaction)) + (setq arguments (nthcdr 3 arguments))))) + +(defun pymacs-defun (index interaction) + ;; Register INDEX on the Lisp side with a Python object that is a function, + ;; and return a lambda form calling that function. If the INTERACTION + ;; specification is nil, the function is not interactive. Otherwise, the + ;; function is interactive, INTERACTION is then either a string, or the + ;; index of an argument-less Python function returning the argument list. + (let ((object (pymacs-python index))) + (cond ((null interaction) + `(lambda (&rest arguments) + (pymacs-apply ',object arguments))) + ((stringp interaction) + `(lambda (&rest arguments) + (interactive ,interaction) + (pymacs-apply ',object arguments))) + (t `(lambda (&rest arguments) + (interactive (pymacs-call ',(pymacs-python interaction))) + (pymacs-apply ',object arguments)))))) + +(defun pymacs-python (index) + ;; Register on the Lisp side a Python object having INDEX, and return it. + ;; The result is meant to be recognised specially by `print-for-eval', and + ;; in the function position by `print-for-apply'. + (let ((object (cons 'pymacs-python index))) + (when pymacs-use-hash-tables + (puthash index object pymacs-weak-hash) + (setq pymacs-used-ids (cons index pymacs-used-ids))) + object)) + +;;; Generating Python code. + +;; Many Lisp expressions cannot fully be represented in Python, at least +;; because the object is mutable on the Lisp side. Such objects are allocated +;; somewhere into a vector of handles, and the handle index is used for +;; communication instead of the expression itself. + +(defvar pymacs-lisp nil + "Vector of handles to hold transmitted expressions.") + +(defvar pymacs-freed-list nil + "List of unallocated indices in Lisp.") + +;; When the Python GC is done with a Lisp object, a communication occurs so to +;; free the object on the Lisp side as well. + +(defun pymacs-allocate-lisp (expression) + ;; This function allocates some handle for an EXPRESSION, and return its + ;; index. + (unless pymacs-freed-list + (let* ((previous pymacs-lisp) + (old-size (length previous)) + (new-size (if (zerop old-size) 100 (+ old-size (/ old-size 2)))) + (counter new-size)) + (setq pymacs-lisp (make-vector new-size nil)) + (while (> counter 0) + (setq counter (1- counter)) + (if (< counter old-size) + (aset pymacs-lisp counter (aref previous counter)) + (setq pymacs-freed-list (cons counter pymacs-freed-list)))))) + (let ((index (car pymacs-freed-list))) + (setq pymacs-freed-list (cdr pymacs-freed-list)) + (aset pymacs-lisp index expression) + index)) + +(defun pymacs-free-lisp (indices) + ;; This function is triggered from Python side for Lisp handles which lost + ;; their last reference. These references should be cut on the Lisp side as + ;; well, or else, the objects will never be garbage-collected. + (while indices + (let ((index (car indices))) + (aset pymacs-lisp index nil) + (setq pymacs-freed-list (cons index pymacs-freed-list) + indices (cdr indices))))) + +(defun pymacs-print-for-apply (function arguments) + ;; This function prints a Python expression calling FUNCTION, which is a + ;; string naming a Python function, or a Python reference, over all its + ;; ARGUMENTS, which are Lisp expressions. + (let ((separator "") + argument) + (if (eq (car-safe function) 'pymacs-python) + (princ (format "python[%d]" (cdr function))) + (princ function)) + (princ "(") + (while arguments + (setq argument (car arguments) + arguments (cdr arguments)) + (princ separator) + (setq separator ", ") + (pymacs-print-for-eval argument)) + (princ ")"))) + +(defun pymacs-print-for-eval (expression) + ;; This function prints a Python expression out of a Lisp EXPRESSION. + (let (done) + (cond ((not expression) + (princ "None") + (setq done t)) + ((eq expression t) + (princ "True") + (setq done t)) + ((numberp expression) + (princ expression) + (setq done t)) + ((stringp expression) + (when (or pymacs-forget-mutability + (not pymacs-mutable-strings)) + (let* ((multibyte (pymacs-multibyte-string-p expression)) + (text (if multibyte + (encode-coding-string expression 'utf-8) + (copy-sequence expression)))) + (set-text-properties 0 (length text) nil text) + (princ (mapconcat 'identity + (split-string (prin1-to-string text) "\n") + "\\n")) + (when multibyte + (princ ".decode('UTF-8')"))) + (setq done t))) + ((symbolp expression) + (let ((name (symbol-name expression))) + ;; The symbol can only be transmitted when in the main oblist. + (when (eq expression (intern-soft name)) + (princ "lisp[") + (prin1 name) + (princ "]") + (setq done t)))) + ((vectorp expression) + (when pymacs-forget-mutability + (let ((limit (length expression)) + (counter 0)) + (princ "(") + (while (< counter limit) + (unless (zerop counter) + (princ ", ")) + (pymacs-print-for-eval (aref expression counter)) + (setq counter (1+ counter))) + (when (= limit 1) + (princ ",")) + (princ ")") + (setq done t)))) + ((eq (car-safe expression) 'pymacs-python) + (princ "python[") + (princ (cdr expression)) + (princ "]") + (setq done t)) + ((pymacs-proper-list-p expression) + (when pymacs-forget-mutability + (princ "[") + (pymacs-print-for-eval (car expression)) + (while (setq expression (cdr expression)) + (princ ", ") + (pymacs-print-for-eval (car expression))) + (princ "]") + (setq done t)))) + (unless done + (let ((class (cond ((vectorp expression) "Vector") + ((and pymacs-use-hash-tables + (hash-table-p expression)) + "Table") + ((bufferp expression) "Buffer") + ((pymacs-proper-list-p expression) "List") + (t "Lisp")))) + (princ class) + (princ "(") + (princ (pymacs-allocate-lisp expression)) + (princ ")"))))) + +;;; Communication protocol. + +(defvar pymacs-transit-buffer nil + "Communication buffer between Emacs and Python.") + +;; The principle behind the communication protocol is that it is easier to +;; generate than parse, and that each language already has its own parser. +;; So, the Emacs side generates Python text for the Python side to interpret, +;; while the Python side generates Lisp text for the Lisp side to interpret. +;; About nothing but expressions are transmitted, which are evaluated on +;; arrival. The pseudo `reply' function is meant to signal the final result +;; of a series of exchanges following a request, while the pseudo `error' +;; function is meant to explain why an exchange could not have been completed. + +;; The protocol itself is rather simple, and contains human readable text +;; only. A message starts at the beginning of a line in the communication +;; buffer, either with `>' for the Lisp to Python direction, or `<' for the +;; Python to Lisp direction. This is followed by a decimal number giving the +;; length of the message text, a TAB character, and the message text itself. +;; Message direction alternates systematically between messages, it never +;; occurs that two successive messages are sent in the same direction. The +;; first message is received from the Python side, it is `(version VERSION)'. + +(defun pymacs-start-services () + ;; This function gets called automatically, as needed. + (let ((buffer (get-buffer-create "*Pymacs*"))) + (with-current-buffer buffer + ;; Erase the buffer in case some previous incarnation of the + ;; Pymacs helper died. Otherwise, the "(goto-char (point-min))" + ;; below might not find the proper synchronising reply and later + ;; trigger a spurious "Protocol error" diagnostic. + (erase-buffer) + (buffer-disable-undo) + (pymacs-set-buffer-multibyte nil) + (set-buffer-file-coding-system 'raw-text) + (save-match-data + ;; Launch the Pymacs helper. + (let ((process + (apply 'start-process "pymacs" buffer + (let ((python (getenv "PYMACS_PYTHON"))) + (if (or (null python) (equal python "")) + pymacs-python-command + python)) + "-c" (concat "import sys;" + " from Pymacs import main;" + " main(*sys.argv[1:])") + (append + (and (>= emacs-major-version 24) '("-f")) + (mapcar 'expand-file-name pymacs-load-path))))) + (pymacs-kill-without-query process) + ;; Receive the synchronising reply. + (while (progn + (goto-char (point-min)) + (not (re-search-forward "<\\([0-9]+\\)\t" nil t))) + (unless (accept-process-output process pymacs-timeout-at-start) + (pymacs-report-error + "Pymacs helper did not start within %d seconds" + pymacs-timeout-at-start))) + (let ((marker (process-mark process)) + (limit-position (+ (match-end 0) + (string-to-number (match-string 1))))) + (while (< (marker-position marker) limit-position) + (unless (accept-process-output process pymacs-timeout-at-start) + (pymacs-report-error + "Pymacs helper probably was interrupted at start"))))) + ;; Check that synchronisation occurred. + (goto-char (match-end 0)) + (let ((reply (read (current-buffer)))) + (if (and (pymacs-proper-list-p reply) + (= (length reply) 2) + (eq (car reply) 'version)) + (unless (string-equal (cadr reply) "0.25") + (pymacs-report-error + "Pymacs Lisp version is 0.25, Python is %s" + (cadr reply))) + (pymacs-report-error "Pymacs got an invalid initial reply"))))) + (if (not pymacs-use-hash-tables) + (setq pymacs-weak-hash t) + (when pymacs-used-ids + ;; A previous Pymacs session occurred in this Emacs session, + ;; some IDs hang around which do not correspond to anything on + ;; the Python side. Python should not recycle such IDs for + ;; new objects. + (let ((pymacs-transit-buffer buffer) + (pymacs-forget-mutability t) + (pymacs-gc-inhibit t)) + (pymacs-call "zombie_python" pymacs-used-ids)) + (setq pymacs-used-ids nil)) + (setq pymacs-weak-hash (make-hash-table :weakness 'value)) + (if (boundp 'post-gc-hook) + (add-hook 'post-gc-hook 'pymacs-schedule-gc) + (setq pymacs-gc-timer (run-at-time 20 20 'pymacs-schedule-gc)))) + ;; If nothing failed, only then declare that Pymacs has started! + (setq pymacs-transit-buffer buffer))) + +(defun pymacs-terminate-services () + ;; This function is mainly provided for documentation purposes. + (interactive) + (garbage-collect) + (pymacs-garbage-collect) + (when (or (not pymacs-used-ids) + (yes-or-no-p "\ +Killing the Pymacs helper might create zombie objects. Kill? ")) + (cond ((boundp 'post-gc-hook) + (remove-hook 'post-gc-hook 'pymacs-schedule-gc)) + ((pymacs-timerp pymacs-gc-timer) + (pymacs-cancel-timer pymacs-gc-timer))) + (when pymacs-transit-buffer + (kill-buffer pymacs-transit-buffer)) + (setq pymacs-gc-inhibit nil + pymacs-gc-timer nil + pymacs-transit-buffer nil + pymacs-lisp nil + pymacs-freed-list nil))) + +(defun pymacs-serve-until-reply (action inserter) + ;; This function builds a Python request by printing ACTION and + ;; evaluating INSERTER, which itself prints an argument. It then + ;; sends the request to the Pymacs helper, and serves all + ;; sub-requests coming from the Python side, until either a reply or + ;; an error is finally received. + (unless (and pymacs-transit-buffer + (buffer-name pymacs-transit-buffer) + (get-buffer-process pymacs-transit-buffer)) + (when pymacs-weak-hash + (unless (or (eq pymacs-auto-restart t) + (and (eq pymacs-auto-restart 'ask) + (yes-or-no-p "The Pymacs helper died. Restart it? "))) + (pymacs-report-error "There is no Pymacs helper!"))) + (pymacs-start-services)) + (when pymacs-gc-wanted + (pymacs-garbage-collect)) + (let ((inhibit-quit t) + done value) + (while (not done) + (let ((form (pymacs-round-trip action inserter))) + (setq action (car form)) + (when (eq action 'free) + (pymacs-free-lisp (cadr form)) + (setq form (cddr form) + action (car form))) + (let* ((pair (pymacs-interruptible-eval (cadr form))) + (success (cdr pair))) + (setq value (car pair)) + (cond ((eq action 'eval) + (if success + (setq action "return" + inserter `(pymacs-print-for-eval ',value)) + (setq action "raise" + inserter `(let ((pymacs-forget-mutability t)) + (pymacs-print-for-eval ,value))))) + ((eq action 'expand) + (if success + (setq action "return" + inserter `(let ((pymacs-forget-mutability t)) + (pymacs-print-for-eval ,value))) + (setq action "raise" + inserter `(let ((pymacs-forget-mutability t)) + (pymacs-print-for-eval ,value))))) + ((eq action 'return) + (if success + (setq done t) + (pymacs-report-error "%s" value))) + ((eq action 'raise) + (if success + (pymacs-report-error "Python: %s" value) + (pymacs-report-error "%s" value))) + (t (pymacs-report-error "Protocol error: %s" form)))))) + value)) + +(defun pymacs-round-trip (action inserter) + ;; This function produces a Python request by printing and + ;; evaluating INSERTER, which itself prints an argument. It sends + ;; the request to the Pymacs helper, awaits for any kind of reply, + ;; and returns it. + (with-current-buffer pymacs-transit-buffer + ;; Possibly trim the beginning of the transit buffer. + (cond ((not pymacs-trace-transit) + (erase-buffer)) + ((consp pymacs-trace-transit) + (when (> (buffer-size) (cdr pymacs-trace-transit)) + (let ((cut (- (buffer-size) (car pymacs-trace-transit)))) + (when (> cut 0) + (save-excursion + (goto-char cut) + (unless (memq (preceding-char) '(0 ?\n)) + (forward-line 1)) + (delete-region (point-min) (point)))))))) + ;; Send the request, wait for a reply, and process it. + (let* ((process (get-buffer-process pymacs-transit-buffer)) + (status (process-status process)) + (marker (process-mark process)) + (moving (= (point) marker)) + send-position reply-position reply) + (save-excursion + (save-match-data + ;; Encode request. + (setq send-position (marker-position marker)) + (let ((standard-output marker)) + (princ action) + (princ " ") + (eval inserter)) + (goto-char marker) + (unless (= (preceding-char) ?\n) + (princ "\n" marker)) + ;; Send request text. + (goto-char send-position) + (insert (format ">%d\t" (- marker send-position))) + (setq reply-position (marker-position marker)) + (process-send-region process send-position marker) + ;; Receive reply text. + (while (and (eq status 'run) + (progn + (goto-char reply-position) + (not (re-search-forward "<\\([0-9]+\\)\t" nil t)))) + (unless (accept-process-output process pymacs-timeout-at-reply) + (setq status (process-status process)))) + (when (eq status 'run) + (let ((limit-position (+ (match-end 0) + (string-to-number (match-string 1))))) + (while (and (eq status 'run) + (< (marker-position marker) limit-position)) + (unless (accept-process-output process pymacs-timeout-at-line) + (setq status (process-status process)))))) + ;; Decode reply. + (if (not (eq status 'run)) + (pymacs-report-error "Pymacs helper status is `%S'" status) + (goto-char (match-end 0)) + (setq reply (read (current-buffer)))))) + (when (and moving (not pymacs-trace-transit)) + (goto-char marker)) + reply))) + +(defun pymacs-interruptible-eval (expression) + ;; This function produces a pair (VALUE . SUCCESS) for EXPRESSION. + ;; A cautious evaluation of EXPRESSION is attempted, and any + ;; error while evaluating is caught, including Emacs quit (C-g). + ;; Any Emacs quit also gets forward as a SIGINT to the Pymacs handler. + ;; With SUCCESS being true, VALUE is the expression value. + ;; With SUCCESS being false, VALUE is an interruption diagnostic. + (condition-case info + (cons (let ((inhibit-quit nil)) (eval expression)) t) + (quit (setq quit-flag t) + (interrupt-process pymacs-transit-buffer) + (cons "*Interrupted!*" nil)) + (error (cons (prin1-to-string info) nil)))) + +(defun pymacs-proper-list-p (expression) + ;; Tell if a list is proper, id est, that it is `nil' or ends with `nil'. + (cond ((not expression)) + ((consp expression) (not (cdr (last expression)))))) + +(provide 'pymacs) +;;; pymacs.el ends here diff --git a/my-funcs-virga.el b/funcs-virga.el similarity index 96% rename from my-funcs-virga.el rename to funcs-virga.el index 06f267b04..e2d8b2de3 100644 --- a/my-funcs-virga.el +++ b/funcs-virga.el @@ -11,4 +11,4 @@ "&& python mappy.py -t wrapper -o " mappyl_output_path " " mappyl_output_path "states.graphml"))) -(provide 'my-funcs-virga) +(provide 'funcs-virga) diff --git a/my-funcs.el b/funcs.el similarity index 99% rename from my-funcs.el rename to funcs.el index bb32b8de1..b501adfb1 100644 --- a/my-funcs.el +++ b/funcs.el @@ -60,4 +60,4 @@ (set-window-start w2 s1) (setq i (1+ i)))))))) -(provide 'my-funcs) +(provide 'funcs) diff --git a/my-package-init/init-ace-jump-mode.el b/init-package/init-ace-jump-mode.el similarity index 100% rename from my-package-init/init-ace-jump-mode.el rename to init-package/init-ace-jump-mode.el diff --git a/init-package/init-auto-complete.el b/init-package/init-auto-complete.el new file mode 100644 index 000000000..2a377c35e --- /dev/null +++ b/init-package/init-auto-complete.el @@ -0,0 +1,7 @@ +(require 'auto-complete-config) +(setq ac-dwim t) +(ac-config-default) + +(defun ac-python-mode-setup () + (add-to-list 'ac-sources 'ac-source-yasnippet)) +(add-hook 'python-mode-hook 'ac-python-mode-setup) diff --git a/my-package-init/init-erlang.el b/init-package/init-erlang.el similarity index 100% rename from my-package-init/init-erlang.el rename to init-package/init-erlang.el diff --git a/my-package-init/init-evil.el b/init-package/init-evil.el similarity index 100% rename from my-package-init/init-evil.el rename to init-package/init-evil.el diff --git a/my-package-init/init-fill-column-indicator.el b/init-package/init-fill-column-indicator.el similarity index 100% rename from my-package-init/init-fill-column-indicator.el rename to init-package/init-fill-column-indicator.el diff --git a/my-package-init/init-highlight-symbol.el b/init-package/init-highlight-symbol.el similarity index 100% rename from my-package-init/init-highlight-symbol.el rename to init-package/init-highlight-symbol.el diff --git a/init-package/init-ipython.el b/init-package/init-ipython.el new file mode 100644 index 000000000..b142e5591 --- /dev/null +++ b/init-package/init-ipython.el @@ -0,0 +1,9 @@ +;; Setup ipython integration with python-mode" +(setq +python-shell-interpreter "ipython" +python-shell-interpreter-args "" +python-shell-prompt-regexp "In \[[0-9]+\]: " +python-shell-prompt-output-regexp "Out\[[0-9]+\]: " +python-shell-completion-setup-code "" +python-shell-completion-string-code "';'.join(get_ipython().complete('''%s''')[1])\n") + diff --git a/init-package/init-jedi.el b/init-package/init-jedi.el new file mode 100644 index 000000000..c3bf9481b --- /dev/null +++ b/init-package/init-jedi.el @@ -0,0 +1 @@ +(add-hook 'python-mode-hook 'jedi:setup) diff --git a/my-package-init/init-p4.el b/init-package/init-p4.el similarity index 100% rename from my-package-init/init-p4.el rename to init-package/init-p4.el diff --git a/my-package-init/init-powerline.el b/init-package/init-powerline.el similarity index 100% rename from my-package-init/init-powerline.el rename to init-package/init-powerline.el diff --git a/my-package-init/init-rainbow-delimiters.el b/init-package/init-rainbow-delimiters.el similarity index 100% rename from my-package-init/init-rainbow-delimiters.el rename to init-package/init-rainbow-delimiters.el diff --git a/init-package/init-smart-operator.el b/init-package/init-smart-operator.el new file mode 100644 index 000000000..98795f18d --- /dev/null +++ b/init-package/init-smart-operator.el @@ -0,0 +1 @@ +(require 'smart-operator) diff --git a/my-package-init/init-solarized-theme.el b/init-package/init-solarized-theme.el similarity index 100% rename from my-package-init/init-solarized-theme.el rename to init-package/init-solarized-theme.el diff --git a/my-package-init/init-surround.el b/init-package/init-surround.el similarity index 100% rename from my-package-init/init-surround.el rename to init-package/init-surround.el diff --git a/init-package/init-yasnippet.el b/init-package/init-yasnippet.el new file mode 100644 index 000000000..fda4c29c0 --- /dev/null +++ b/init-package/init-yasnippet.el @@ -0,0 +1,5 @@ +(require 'yasnippet) +(yas-global-mode t) +(setq yas-prompt-functions '(yas-dropdown-prompt yas-ido-prompt yas-x-prompt)) +(setq yas-wrap-around-region 'cua) + diff --git a/init.el b/init.el index 196211d56..033dd179c 100644 --- a/init.el +++ b/init.el @@ -1,51 +1,38 @@ (require 'cl) -;; Locations =================================================================== +;; Locations ================================================================== (defvar user-home-directory (expand-file-name (concat user-emacs-directory "../")) - "The user's home directory.") + "Emacs home directory.") -(defvar user-custom-modes-dir - (expand-file-name (concat user-emacs-directory "custom-modes/")) - "The directory containing the user's custom modes.") +(defvar user-pre-directory + (expand-file-name (concat user-emacs-directory "pre/")) + "Pre-configuration scripts.") + +(defvar user-post-directory + (expand-file-name (concat user-emacs-directory "post/")) + "Post-configuration setup.") + +(defvar user-extensions-directory + (expand-file-name (concat user-emacs-directory "extensions/")) + "Additional extensions.") (add-to-list 'load-path user-emacs-directory) +(add-to-list 'load-path user-extensions-directory) -;; Config files ================================================================ -(progn - (setq user-emacs-config-dir (concat user-emacs-directory "config/")) - (when (file-exists-p user-emacs-config-dir) - (dolist (l (directory-files user-emacs-config-dir nil "^[^#].*el$")) - (load (concat user-emacs-config-dir l))))) +;; Pre-config ================================================================= +(progn (when (file-exists-p user-pre-directory) + (dolist (l (directory-files user-pre-directory nil "^[^#].*el$")) + (load (concat user-pre-directory l))))) -(require 'my-funcs) -(require 'my-funcs-virga) -(require 'my-packages) -(require 'my-keybindings) +;; Package setup ============================================================== +(require 'funcs) +(require 'funcs-virga) +(require 'packages) +(require 'keybindings) -;; Python ====================================================================== -;; clone git repository https://github.com/gabrielelanaro/emacs-for-python -;; ============================================================================= -(setq ropemacs-global-prefix "C-x /") ;; avoid conflict with p4 global prefix -(load-file (concat user-emacs-directory "emacs-for-python/epy-init.el")) -(require 'epy-setup) -(require 'epy-python) -(require 'epy-completion) -(require 'epy-editing) -(require 'epy-bindings) -(require 'epy-nose) -(epy-setup-checker "pyflakes %f") -(epy-setup-ipython) -;; line hightlighting -(global-hl-line-mode t) -(set-face-background 'hl-line "#073642") -;; identation highlighting -;; (require 'highlight-indentation) -;; (add-hook 'python-mode-hook 'highlight-indentation) -;; disable auto-pairing -;;(setq skeleton-pair nil) -(add-hook 'python-mode-hook (lambda () - (local-set-key "\C-c\C-c" 'syl-python-compile))) +;; Post-config ================================================================ +(progn (when (file-exists-p user-post-directory) + (dolist (l (directory-files user-post-directory nil "^[^#].*el$")) + (load (concat user-post-directory l))))) -;; Custom modes ================================================================ -(load-file (concat user-custom-modes-dir "heartbeat-cursor.el")) diff --git a/my-keybindings-virga.el b/keybindings-virga.el similarity index 85% rename from my-keybindings-virga.el rename to keybindings-virga.el index df53152bb..e3ad8a01b 100644 --- a/my-keybindings-virga.el +++ b/keybindings-virga.el @@ -3,4 +3,4 @@ ;; ============================================================================= -(provide 'my-keybindings-work) +(provide 'keybindings-virga) diff --git a/my-keybindings.el b/keybindings.el similarity index 83% rename from my-keybindings.el rename to keybindings.el index a0d7a07e1..f2ccf5dd7 100644 --- a/my-keybindings.el +++ b/keybindings.el @@ -1,4 +1,4 @@ ;; Key Bindings ================================================================ (global-set-key (kbd "C-x x") 'kill-this-buffer) -(provide 'my-keybindings) +(provide 'keybindings) diff --git a/my-packages.el b/packages.el similarity index 81% rename from my-packages.el rename to packages.el index a3fb80ee7..991aee6da 100644 --- a/my-packages.el +++ b/packages.el @@ -6,32 +6,42 @@ ("melpa" . "http://melpa.milkbox.net/packages/") ("technomancy" . "http://repo.technomancy.us/emacs/"))) (package-initialize) -(defvar z:my-packages +(defvar z:packages '( ace-jump-mode + auto-complete + autopair + deferred + epc erlang evil fill-column-indicator + fuzzy highlight-symbol + ipython + jedi key-chord p4 powerline + popup rainbow-delimiters + smart-operator solarized-theme surround + yasnippet )) ;;; install missing packages -(let ((not-installed (remove-if 'package-installed-p z:my-packages))) +(let ((not-installed (remove-if 'package-installed-p z:packages))) (if not-installed (if (y-or-n-p (format "there are %d packages to be installed. install them? " (length not-installed))) (progn (package-refresh-contents) - (dolist (package z:my-packages) + (dolist (package z:packages) (when (not (package-installed-p package)) (package-install package))))))) ;;; initialize packages -(setq z:package-init-dir (concat user-emacs-directory "my-package-init/")) +(setq z:package-init-dir (concat user-emacs-directory "init-package/")) (message (format "initializing packages out of %s" z:package-init-dir)) (dolist (package (append (mapcar 'car package--builtins) package-activated-list)) (let* ((initfile (concat z:package-init-dir (format "init-%s.el" package)))) @@ -43,4 +53,4 @@ (when (memq window-system '(mac ns)) (exec-path-from-shell-initialize)) -(provide 'my-packages) +(provide 'packages) diff --git a/post/python.el b/post/python.el new file mode 100644 index 000000000..6fa4cf480 --- /dev/null +++ b/post/python.el @@ -0,0 +1,73 @@ + +;; flymake ------------------------------------------------------------------- +(defun flymake-create-copy-file () + "Create a copy local file" + (let* ((temp-file (flymake-init-create-temp-buffer-copy + 'flymake-create-temp-inplace))) + (file-relative-name + temp-file + (file-name-directory buffer-file-name)))) + +(defun flymake-command-parse (cmdline) + "Parses the command line CMDLINE in a format compatible + with flymake, as:(list cmd-name arg-list) + +The CMDLINE should be something like: + + flymake %f python custom.py %f + +%f will be substituted with a temporary copy of the file that is + currently being checked. +" + (let ((cmdline-subst (replace-regexp-in-string "%f" (flymake-create-copy-file) cmdline))) + (setq cmdline-subst (split-string-and-unquote cmdline-subst)) + (list (first cmdline-subst) (rest cmdline-subst)) + )) + + +(when (load-file (concat user-extensions-directory "flymake-patch.el")) + (setq flymake-info-line-regex + (append flymake-info-line-regex '("unused$" "^redefinition" "used$"))) + (load-library "flymake-cursor")) + +(defun epy-setup-checker (cmdline) + (add-to-list 'flymake-allowed-file-name-masks + (list "\\.py\\'" (apply-partially 'flymake-command-parse cmdline))) + ) +(epy-setup-checker "pyflakes %f") + +;; pymacs -------------------------------------------------------------------- +(setq ropemacs-global-prefix "C-x /") ;; avoid conflict with p4 global prefix +(require 'pymacs (concat user-extensions-directory "pymacs.el")) +(defun setup-ropemacs () + (pymacs-load "ropemacs" "rope-") + ;; Stops from erroring if there's a syntax err + (setq ropemacs-codeassist-maxfixes 3) + ;; Configurations + (setq ropemacs-guess-project t) + (setq ropemacs-enable-autoimport t) + (setq ropemacs-autoimport-modules '("os" "shutil" "sys" "logging")) + ;; Adding hook to automatically open a rope project if there is one + ;; in the current or in the upper level directory + (add-hook 'python-mode-hook + (lambda () + (cond ((file-exists-p ".ropeproject") + (rope-open-project default-directory)) + ((file-exists-p "../.ropeproject") + (rope-open-project (concat default-directory ".."))) + ))) + ) + +(eval-after-load 'python + '(progn + ;; Ropemacs Configuration + (setup-ropemacs) + ;; Not on all modes, please + ;; Be careful of mumamo, buffer file name nil + (add-hook 'python-mode-hook (lambda () (if (buffer-file-name) + (flymake-mode)))) + ) + ) + +(add-hook 'python-mode-hook (lambda () + (local-set-key "\C-c\C-c" 'syl-python-compile))) diff --git a/pre/editing.el b/pre/editing.el new file mode 100644 index 000000000..90a04b034 --- /dev/null +++ b/pre/editing.el @@ -0,0 +1,11 @@ +;; whitespace-mode +(setq-default show-trailing-whitespace nil) +;; When point is on paranthesis, highlight the matching one +(show-paren-mode t) +;; use only spaces and no tabs +(setq-default indent-tabs-mode nil) +(setq default-tab-width 4) +;; highlight current line +(global-hl-line-mode t) +(set-face-background 'hl-line "#073642") + diff --git a/pre/navigating.el b/pre/navigating.el new file mode 100644 index 000000000..f79abcf54 --- /dev/null +++ b/pre/navigating.el @@ -0,0 +1,3 @@ +(ido-mode t) +(setq ido-enable-flex-matching t) ;; enable fuzzy matching + diff --git a/pre/session.el b/pre/session.el new file mode 100644 index 000000000..0c9f9760d --- /dev/null +++ b/pre/session.el @@ -0,0 +1,11 @@ +;; Inhibit startup message +(setq inhibit-startup-message t + inhibit-startup-echo-area-message t) +(setq initial-scratch-message "") +;; save session +(desktop-save-mode 1) +;; auto-save +(add-hook 'before-save-hook (lambda () (delete-trailing-whitespace))) +(setq redisplay-dont-pause t) +;; Do not make backup files +(setq make-backup-files nil) diff --git a/config/global.el b/pre/ui.el similarity index 51% rename from config/global.el rename to pre/ui.el index 30b560963..55dbf375b 100644 --- a/config/global.el +++ b/pre/ui.el @@ -1,39 +1,21 @@ -;; font size -(set-face-attribute 'default nil :height 110) -;; number colon mode -(global-linum-mode t) -;; full screen +;; edit area full screen (tool-bar-mode -1) (menu-bar-mode -1) (scroll-bar-mode -1) (fringe-mode 0) +;; font size +(set-face-attribute 'default nil :height 110) +;; number colon mode +(global-linum-mode t) +;; Show column number in mode line +(setq column-number-mode t) ;; no blink (blink-cursor-mode (- (*) (*) (*))) -;; save session - (desktop-save-mode 1) ;; tool tips in echo area (tooltip-mode -1) (setq tooltip-use-echo-area t) -;; whitespace-mode -(setq-default show-trailing-whitespace nil) -;; Inhibit startup message -(setq inhibit-startup-message t - inhibit-startup-echo-area-message t) -(setq initial-scratch-message "") -;; Do not make backup files -(setq make-backup-files nil) ;; When emacs asks for "yes" or "no", let "y" or "n" sufficide (fset 'yes-or-no-p 'y-or-n-p) -;; Show column number in mode line -(setq column-number-mode t) -;; When point is on paranthesis, highlight the matching one -(show-paren-mode t) -;; auto-save -(add-hook 'before-save-hook (lambda () (delete-trailing-whitespace))) -(setq redisplay-dont-pause t) -;; use only spaces and no tabs -(setq-default indent-tabs-mode nil) -(setq default-tab-width 4) ;; move focus to newly split window (defadvice split-window (after move-point-to-new-window activate) "Moves the point to the newly created window after splitting."