Browse Source

Small updates for new idea-lang- structure

master
Peter J. Jones 9 years ago
parent
commit
1990e695db

+ 1
- 0
Makefile View File

@@ -23,4 +23,5 @@ $(DEST):

%.elc: %.el
@ echo compile $(notdir $<)
@ rm -f $@
@ $(EMACS) $(EMACS_FLAGS) $< 2>&1 | (egrep -v ^Wrote; exit 0)

+ 3
- 2
lisp/idea-complement.el View File

@@ -1,6 +1,6 @@
;;; idea-complement.el --- Idea complement minor mode.
;;
;; Copyright (C) 2010 pmade inc. (Peter Jones pjones@pmade.com)
;; Copyright (C) 2010-2011 pmade inc. (Peter Jones pjones@pmade.com)
;;
;; Permission is hereby granted, free of charge, to any person obtaining
;; a copy of this software and associated documentation files (the
@@ -22,6 +22,7 @@
;; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

(eval-when-compile
(require 'idea-lang-helper)
(require 'idea-windows))

(defgroup idea-complement nil
@@ -50,7 +51,7 @@ anything.")

(defun idea-complement-start ()
(make-local-variable 'idea-complement-last-complement)
(require (intern (concat "idea-complement-" (symbol-name major-mode))) nil t)
(idea-lang-load)
(idea-complement-update-window 1))

;;;###autoload

+ 3
- 3
lisp/idea-lang-c-mode.el View File

@@ -1,6 +1,6 @@
;;; idea-complement-c-mode.el --- Find complement files for C mode
;;; idea-lang-c-mode.el --- Idea language features for c-mode.
;;
;; Copyright (C) 2010 pmade inc. (Peter Jones pjones@pmade.com)
;; Copyright (C) 2010-2011 pmade inc. (Peter Jones pjones@pmade.com)
;;
;; Permission is hereby granted, free of charge, to any person obtaining
;; a copy of this software and associated documentation files (the
@@ -39,4 +39,4 @@
(idea-complement-first-existing-file
idea-complement-c-mode-header-search-path))
(provide 'idea-complement-c-mode)
(provide 'idea-lang-c-mode)

+ 30
- 0
lisp/idea-lang-helper.el View File

@@ -0,0 +1,30 @@
;;; idea-lang-helper.el --- Help load Idea language files.
;;
;; Copyright (C) 2010-2011 pmade inc. (Peter Jones pjones@pmade.com)
;;
;; Permission is hereby granted, free of charge, to any person obtaining
;; a copy of this software and associated documentation files (the
;; "Software"), to deal in the Software without restriction, including
;; without limitation the rights to use, copy, modify, merge, publish,
;; distribute, sublicense, and/or sell copies of the Software, and to
;; permit persons to whom the Software is furnished to do so, subject to
;; the following conditions:
;;
;; The above copyright notice and this permission notice shall be
;; included in all copies or substantial portions of the Software.
;;
;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
;; LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
;; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

(defun idea-lang-load (&optional mode-str)
"Load the Idea language file for the given mode (or the current
major mode if no mode is given)."
(let ((mode (or mode-str major-mode)))
(require (intern (concat "idea-lang-" (symbol-name mode))) nil t)))

(provide 'idea-lang-helper)

+ 4
- 4
lisp/idea-lang-objc-mode.el View File

@@ -1,6 +1,6 @@
;;; idea-complement-objc-mode.el --- Find complement files for Objective-C
;;; idea-lang-objc-mode.el --- Idea languages features for objc-mode.
;;
;; Copyright (C) 2010 pmade inc. (Peter Jones pjones@pmade.com)
;; Copyright (C) 2010-2011 pmade inc. (Peter Jones pjones@pmade.com)
;;
;; Permission is hereby granted, free of charge, to any person obtaining
;; a copy of this software and associated documentation files (the
@@ -21,7 +21,7 @@
;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
;; WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

(require 'idea-complement-c-mode)
(require 'idea-lang-c-mode)

(defcustom idea-complement-objc-mode-functions
'(idea-complement-c-mode-find-header)
@@ -29,4 +29,4 @@
:type 'sexp
:group 'idea-complement)

(provide 'idea-complement-objc-mode)
(provide 'idea-lang-objc-mode)

+ 3
- 3
lisp/idea-lang-ruby-mode.el View File

@@ -1,6 +1,6 @@
;;; idea-complement-ruby-mode.el --- Find complement files for Ruby mode
;;; idea-lang-ruby-mode.el --- Idea language features for ruby-mode.
;;
;; Copyright (C) 2010 pmade inc. (Peter Jones pjones@pmade.com)
;; Copyright (C) 2010-2011 pmade inc. (Peter Jones pjones@pmade.com)
;;
;; Permission is hereby granted, free of charge, to any person obtaining
;; a copy of this software and associated documentation files (the
@@ -103,4 +103,4 @@ win."
(idea-complement-first-existing-file
idea-complement-ruby-mode-test-search-path))
(provide 'idea-complement-ruby-mode)
(provide 'idea-lang-ruby-mode)

+ 1
- 1
lisp/idea-windows.el View File

@@ -1,6 +1,6 @@
;;; idea-windows.el --- Idea window management functions
;;
;; Copyright (C) 2010 pmade inc. (Peter Jones pjones@pmade.com)
;; Copyright (C) 2010-2011 pmade inc. (Peter Jones pjones@pmade.com)
;;
;; Permission is hereby granted, free of charge, to any person obtaining
;; a copy of this software and associated documentation files (the

+ 5
- 2
lisp/idea.el View File

@@ -1,6 +1,6 @@
;;; idea.el --- Idea
;;
;; Copyright (C) 2010 pmade inc. (Peter Jones pjones@pmade.com)
;; Copyright (C) 2010-2011 pmade inc. (Peter Jones pjones@pmade.com)
;;
;; Permission is hereby granted, free of charge, to any person obtaining
;; a copy of this software and associated documentation files (the
@@ -23,6 +23,9 @@

(defgroup idea nil "Idea" :version "0.0.1" :group 'tools)

;; idea-lang-helper
(autoload 'idea-lang-load "idea-lang-helper")

;; idea-windows
(autoload 'idea-window-list "idea-windows")
(autoload 'idea-select-window "idea-windows")
@@ -30,6 +33,6 @@
(autoload 'idea-number-of-windows "idea-windows")

;; idea-complement
(autoload 'idea-complement-mode "idea-complement" nil t)
(autoload 'idea-complement-mode "idea-complement" nil t)

(provide 'idea)

Loading…
Cancel
Save