diff --git a/emacs-vala-COPYING b/emacs-vala-COPYING deleted file mode 100644 index d159169..0000000 --- a/emacs-vala-COPYING +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - 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 of the License, 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. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/vala-init.el b/vala-init.el deleted file mode 100644 index 91219a9..0000000 --- a/vala-init.el +++ /dev/null @@ -1,5 +0,0 @@ -;; Register vala-mode - -(autoload 'vala-mode "vala-mode" "Major mode for editing Vala code." t) -(add-to-list 'auto-mode-alist '("\\.vala$" . vala-mode)) -(add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode)) diff --git a/vala-mode.el b/vala-mode.el deleted file mode 100644 index d125540..0000000 --- a/vala-mode.el +++ /dev/null @@ -1,398 +0,0 @@ -;;; vala-mode.el --- Vala mode derived mode - -;; Author: 2005 Dylan R. E. Moonfire -;; 2008 Étienne BERSAC -;; Maintainer: Étienne BERSAC -;; Modifier: Kentaro NAKAZAWA -;; Created: 2008 May the 4th -;; Modified: April 2011 -;; Version: 0.1 -;; Keywords: vala languages oop - -;; 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 of the License, 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; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. - -;;; Commentary: -;; -;; See http://live.gnome.org/Vala for details about Vala language. -;; -;; This is a separate mode to implement the Vala constructs and -;; font-locking. It is mostly the csharp-mode from -;; http://mfgames.com/linux/csharp-mode with vala specific keywords -;; and filename suffixes. -;; -;; Note: The interface used in this file requires CC Mode 5.30 or -;; later. - -;;; .emacs (don't put in (require 'vala-mode)) -;; (autoload 'vala-mode "vala-mode" "Major mode for editing Vala code." t) -;; (setq auto-mode-alist -;; (append '(("\\.vala$" . vala-mode)) auto-mode-alist)) - -;;; Versions: -;; -;; 0.1 : Initial version based on csharp-mode -;; - -;; This is a copy of the function in cc-mode which is used to handle -;; the eval-when-compile which is needed during other times. -(defun c-filter-ops (ops opgroup-filter op-filter &optional xlate) - ;; See cc-langs.el, a direct copy. - (unless (listp (car-safe ops)) - (setq ops (list ops))) - (cond ((eq opgroup-filter t) - (setq opgroup-filter (lambda (opgroup) t))) - ((not (functionp opgroup-filter)) - (setq opgroup-filter `(lambda (opgroup) - (memq opgroup ',opgroup-filter))))) - (cond ((eq op-filter t) - (setq op-filter (lambda (op) t))) - ((stringp op-filter) - (setq op-filter `(lambda (op) - (string-match ,op-filter op))))) - (unless xlate - (setq xlate 'identity)) - (c-with-syntax-table (c-lang-const c-mode-syntax-table) - (delete-duplicates - (mapcan (lambda (opgroup) - (when (if (symbolp (car opgroup)) - (when (funcall opgroup-filter (car opgroup)) - (setq opgroup (cdr opgroup)) - t) - t) - (mapcan (lambda (op) - (when (funcall op-filter op) - (let ((res (funcall xlate op))) - (if (listp res) res (list res))))) - opgroup))) - ops) - :test 'equal))) - -;; This inserts the bulk of the code. -(require 'cc-mode) - -;; These are only required at compile time to get the sources for the -;; language constants. (The cc-fonts require and the font-lock -;; related constants could additionally be put inside an -;; (eval-after-load "font-lock" ...) but then some trickery is -;; necessary to get them compiled.) -(eval-when-compile - (let ((load-path - (if (and (boundp 'byte-compile-dest-file) - (stringp byte-compile-dest-file)) - (cons (file-name-directory byte-compile-dest-file) load-path) - load-path))) - (load "cc-mode" nil t) - (load "cc-fonts" nil t) - (load "cc-langs" nil t))) - -(eval-and-compile - ;; Make our mode known to the language constant system. Use Java - ;; mode as the fallback for the constants we don't change here. - ;; This needs to be done also at compile time since the language - ;; constants are evaluated then. - (c-add-language 'vala-mode 'java-mode)) - -;; Java uses a series of regexes to change the font-lock for class -;; references. The problem comes in because Java uses Pascal (leading -;; space in names, SomeClass) for class and package names, but -;; Camel-casing (initial lowercase, upper case in words, -;; i.e. someVariable) for variables. -;;(error (byte-compile-dest-file)) -;;(error (c-get-current-file)) -(c-lang-defconst c-opt-after-id-concat-key - vala (if (c-lang-const c-opt-identifier-concat-key) - (c-lang-const c-symbol-start))) - -(c-lang-defconst c-basic-matchers-before - vala `( -;;;; Font-lock the attributes by searching for the -;;;; appropriate regex and marking it as TODO. - ;;,`(,(concat "\\(" vala-attribute-regex "\\)") - ;; 0 font-lock-function-name-face) - - ;; Put a warning face on the opener of unclosed strings that - ;; can't span lines. Later font - ;; lock packages have a `font-lock-syntactic-face-function' for - ;; this, but it doesn't give the control we want since any - ;; fontification done inside the function will be - ;; unconditionally overridden. - ,(c-make-font-lock-search-function - ;; Match a char before the string starter to make - ;; `c-skip-comments-and-strings' work correctly. - (concat ".\\(" c-string-limit-regexp "\\)") - '((c-font-lock-invalid-string))) - - ;; Fontify keyword constants. - ,@(when (c-lang-const c-constant-kwds) - (let ((re (c-make-keywords-re nil - (c-lang-const c-constant-kwds)))) - `((eval . (list ,(concat "\\<\\(" re "\\)\\>") - 1 c-constant-face-name))))) - - ;; Fontify all keywords except the primitive types. - ,`(,(concat "\\<" (c-lang-const c-regular-keywords-regexp)) - 1 font-lock-keyword-face) - - ;; Fontify leading identifiers in fully - ;; qualified names like "Foo.Bar". - ,@(when (c-lang-const c-opt-identifier-concat-key) - `((,(byte-compile - `(lambda (limit) - (while (re-search-forward - ,(concat "\\(\\<" ; 1 - "\\(" (c-lang-const c-symbol-key) - "\\)" ; 2 - "[ \t\n\r\f\v]*" - (c-lang-const - c-opt-identifier-concat-key) - "[ \t\n\r\f\v]*" - "\\)" - "\\(" - (c-lang-const - c-opt-after-id-concat-key) - "\\)") - limit t) - (unless (progn - (goto-char (match-beginning 0)) - (c-skip-comments-and-strings limit)) - (or (get-text-property (match-beginning 2) 'face) - (c-put-font-lock-face (match-beginning 2) - (match-end 2) - c-reference-face-name)) - (goto-char (match-end 1))))))))) - )) - -;; Vala does not allow a leading qualifier operator. It also doesn't -;; allow the ".*" construct of Java. So, we redo this regex without -;; the "\\|\\*" regex. -(c-lang-defconst c-identifier-key - vala (concat "\\(" (c-lang-const c-symbol-key) "\\)" ; 1 - (concat "\\(" - "[ \t\n\r\f\v]*" - (c-lang-const c-opt-identifier-concat-key) - "[ \t\n\r\f\v]*" - (concat "\\(" - "\\(" (c-lang-const c-symbol-key) "\\)" - "\\)") - "\\)*"))) - -;; Vala has a few rules that are slightly different than Java for -;; operators. This also removed the Java's "super" and replaces it -;; with the Vala's "base". -(c-lang-defconst c-operators - vala `((prefix "base"))) - -;; Vala directives -(c-lang-defconst c-opt-cpp-prefix - vala "\\s *#\\s *") - - -;; Vala uses the following assignment operators -(c-lang-defconst c-assignment-operators - vala '("=" "*=" "/=" "%=" "+=" "-=" ">>=" "<<=" - "&=" "^=" "|=" "++" "--")) - -;; This defines the primative types for Vala -(c-lang-defconst c-primitive-type-kwds - vala '("void" "bool" "char" "uchar" "short" "ushort" "int" "uint" "long" "ulong" - "size_t" "ssize_t" "int8" "uint8" "int16" "uint16" "int32" "uint32" "int64" "uint64" - "unichar" "float" "double" "string")) - -;; The keywords that define that the following is a type, such as a -;; class definition. -(c-lang-defconst c-type-prefix-kwds - vala '("class" "interface" "struct" "enum" "signal")) - -;; Type modifier keywords. They appear anywhere in types, but modifiy -;; instead create one. -(c-lang-defconst c-type-modifier-kwds - vala '("const")) - -;; Structures that are similiar to classes. -(c-lang-defconst c-class-decl-kwds - vala '("class" "interface")) - -;; The various modifiers used for class and method descriptions. -(c-lang-defconst c-modifier-kwds - vala '("public" "partial" "private" "const" "abstract" - "protected" "ref" "in" "out" "static" "virtual" - "override" "params" "internal" "weak" "owned" - "unowned" "async" "yield")) - -;; We don't use the protection level stuff because it breaks the -;; method indenting. Not sure why, though. -(c-lang-defconst c-protection-kwds - vala nil) - -;; Define the keywords that can have something following after them. -(c-lang-defconst c-type-list-kwds - vala '("struct" "class" "interface" "is" "as" - "delegate" "event" "set" "get" "add" "remove" - "callback" "signal" "var" "default")) - -;; This allows the classes after the : in the class declartion to be -;; fontified. -(c-lang-defconst c-typeless-decl-kwds - vala '(":")) - -;; Sets up the enum to handle the list properly -(c-lang-defconst c-brace-list-decl-kwds - vala '("enum" "errordomain")) - -;; We need to remove Java's package keyword -(c-lang-defconst c-ref-list-kwds - vala '("using" "namespace" "construct")) - -;; Follow-on blocks that don't require a brace -(c-lang-defconst c-block-stmt-2-kwds - vala '("for" "if" "switch" "while" "catch" "foreach" "lock")) - -;; Statements that break out of braces -(c-lang-defconst c-simple-stmt-kwds - vala '("return" "continue" "break" "throw")) - -;; Statements that allow a label -;; TODO? -(c-lang-defconst c-before-label-kwds - vala nil) - -;; Constant keywords -(c-lang-defconst c-constant-kwds - vala '("true" "false" "null")) - -;; Keywords that start "primary expressions." -(c-lang-defconst c-primary-expr-kwds - vala '("this" "base")) - -;; We need to treat namespace as an outer block to class indenting -;; works properly. -(c-lang-defconst c-other-block-decl-kwds - vala '("namespace" "extern")) - -;; We need to include the "in" for the foreach -(c-lang-defconst c-other-kwds - vala '("in" "sizeof" "typeof")) - -(require 'cc-awk) - -(c-lang-defconst c-at-vsemi-p-fn - vala 'c-awk-at-vsemi-p) - - -;; (defcustom vala-font-lock-extra-types nil -;; "*List of extra types (aside from the type keywords) to recognize in Vala mode. -;; Each list item should be a regexp matching a single identifier.") - -(defconst vala-font-lock-keywords-1 (c-lang-const c-matchers-1 vala) - "Minimal highlighting for Vala mode.") - -(defconst vala-font-lock-keywords-2 (c-lang-const c-matchers-2 vala) - "Fast normal highlighting for Vala mode.") - -(defconst vala-font-lock-keywords-3 (c-lang-const c-matchers-3 vala) - "Accurate normal highlighting for Vala mode.") - -(defvar vala-font-lock-keywords vala-font-lock-keywords-3 - "Default expressions to highlight in Vala mode.") - -(defvar vala-mode-syntax-table - nil - "Syntax table used in vala-mode buffers.") -(or vala-mode-syntax-table - (setq vala-mode-syntax-table - (funcall (c-lang-const c-make-mode-syntax-table vala)))) - -(defvar vala-mode-abbrev-table nil - "Abbreviation table used in vala-mode buffers.") -(c-define-abbrev-table 'vala-mode-abbrev-table - ;; Keywords that if they occur first on a line - ;; might alter the syntactic context, and which - ;; therefore should trig reindentation when - ;; they are completed. - '(("else" "else" c-electric-continued-statement 0) - ("while" "while" c-electric-continued-statement 0) - ("catch" "catch" c-electric-continued-statement 0) - ("finally" "finally" c-electric-continued-statement 0))) - -(defvar vala-mode-map (let ((map (c-make-inherited-keymap))) - ;; Add bindings which are only useful for Vala - map) - "Keymap used in vala-mode buffers.") - -;;(easy-menu-define vala-menu vala-mode-map "Vala Mode Commands" -;; ;; Can use `vala' as the language for `c-mode-menu' -;; ;; since its definition covers any language. In -;; ;; this case the language is used to adapt to the -;; ;; nonexistence of a cpp pass and thus removing some -;; ;; irrelevant menu alternatives. -;; (cons "Vala" (c-lang-const c-mode-menu vala))) - -;;; Autoload mode trigger -(add-to-list 'auto-mode-alist '("\\.vala$" . vala-mode)) -(add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode)) - -;; Custom variables -(defcustom vala-mode-hook nil - "*Hook called by `vala-mode'." - :type 'hook - :group 'c) - -;;; The entry point into the mode -;;;###autoload -(defun vala-mode () - "Major mode for editing Vala code. -This is a simple example of a separate mode derived from CC Mode -to support a language with syntax similar to -C#/C/C++/ObjC/Java/IDL/Pike. - -The hook `c-mode-common-hook' is run with no args at mode -initialization, then `vala-mode-hook'. - -Key bindings: -\\{vala-mode-map}" - (interactive) - (kill-all-local-variables) - (c-initialize-cc-mode t) - (set-syntax-table vala-mode-syntax-table) - (setq major-mode 'vala-mode - mode-name "Vala" - local-abbrev-table vala-mode-abbrev-table - abbrev-mode t) - (use-local-map c-mode-map) - ;; `c-init-language-vars' is a macro that is expanded at compile - ;; time to a large `setq' with all the language variables and their - ;; customized values for our language. - (c-init-language-vars vala-mode) - ;; `c-common-init' initializes most of the components of a CC Mode - ;; buffer, including setup of the mode menu, font-lock, etc. - ;; There's also a lower level routine `c-basic-common-init' that - ;; only makes the necessary initialization to get the syntactic - ;; analysis and similar things working. - (c-common-init 'vala-mode) - ;;(easy-menu-add vala-menu) - (c-set-style "linux") - (setq indent-tabs-mode t) - (setq c-basic-offset 4) - (setq tab-width 4) - (c-toggle-auto-newline -1) - (c-toggle-hungry-state -1) - (run-hooks 'c-mode-common-hook) - (run-hooks 'vala-mode-hook) - (c-update-modeline)) - -(provide 'vala-mode) - -;;; vala-mode.el ends here diff --git a/vala.spec b/vala.spec index 6c0c1f1..cf95f9c 100644 --- a/vala.spec +++ b/vala.spec @@ -3,7 +3,7 @@ Name: vala Version: 0.27.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modern programming language for GNOME # Most files are LGPLv2.1+, curses.vapi is 2-clause BSD @@ -14,9 +14,6 @@ URL: http://live.gnome.org/Vala # as it breaks Colin Walters' automatic build script # see https://bugzilla.redhat.com/show_bug.cgi?id=609292 Source0: http://download.gnome.org/sources/vala/0.27/vala-%{version}.tar.xz -Source1: vala-mode.el -Source2: vala-init.el -Source3: emacs-vala-COPYING BuildRequires: flex BuildRequires: bison @@ -25,9 +22,6 @@ BuildRequires: libxslt # only if Vala source files are patched # BuildRequires: vala -# for Emacs modes -BuildRequires: emacs emacs-el - # for tests # BuildRequires: dbus-x11 @@ -43,6 +37,8 @@ Requires(preun): %{_sbindir}/alternatives # From rhughes-f20-gnome-3-12 copr Obsoletes: compat-vala022 < 0.24 %endif +Obsoletes: emacs-vala < 0.27.1 +Obsoletes: emacs-vala-el < 0.27.1 %description Vala is a new programming language that aims to bring modern programming @@ -108,30 +104,6 @@ applications and libraries written in C. This package contains documentation in a devhelp HTML book. -%package -n emacs-%{name} -Summary: Vala mode for Emacs -License: GPLv2+ - -BuildArch: noarch -Requires: emacs(bin) >= %{_emacs_version} - -%description -n emacs-%{name} -An Emacs mode for editing Vala source code. - - -%package -n emacs-%{name}-el -Summary: Elisp source files for emacs-%{name} -License: GPLv2+ - -BuildArch: noarch -Requires: emacs-%{name} = %{version}-%{release} - -%description -n emacs-%{name}-el -This package contains the elisp source files for Vala under GNU -Emacs. You do not need to install this package to run Vala. Install -the emacs-%{name} package to use Vala with GNU Emacs. - - %prep %setup -q @@ -141,11 +113,6 @@ the emacs-%{name} package to use Vala with GNU Emacs. # Don't use rpath! sed -i 's|/lib /usr/lib|/lib /usr/lib /lib64 /usr/lib64|' libtool make %{?_smp_mflags} -# Compile emacs module -mkdir emacs-vala && cd emacs-vala && cp -p %{SOURCE1} . -%{_emacs_bytecompile} vala-mode.el -# and copy its licensing file -cp -p %{SOURCE3} COPYING %install @@ -165,12 +132,6 @@ done mkdir -p $RPM_BUILD_ROOT%{_datadir}/vala/vapi find %{buildroot} -name '*.la' -exec rm -f {} ';' -# Emacs mode files -mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} -mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir} -cp -p emacs-vala/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} -cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir} - %check # make check @@ -267,17 +228,11 @@ done %files doc %doc %{_datadir}/devhelp/books/vala-%{api_ver} -%files -n emacs-%{name} -%doc emacs-vala/COPYING -%dir %{_emacs_sitelispdir}/%{name} -%{_emacs_sitelispdir}/%{name}/*.elc -%{_emacs_sitestartdir}/*.el - -%files -n emacs-%{name}-el -%{_emacs_sitelispdir}/%{name}/*.el - %changelog +* Sat Feb 21 2015 Kalev Lember - 0.27.1-2 +- Drop emacs bindings that no longer build + * Mon Jan 19 2015 Richard Hughes - 0.27.1-1 - Update to 0.27.1