diff options
| author | Joakim Verona | 2013-06-12 12:32:25 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-06-12 12:32:25 +0200 |
| commit | e6fa6da6899bf1b4877b96c450eae3934085d560 (patch) | |
| tree | 48e6fda463d24a792ec8428fb8044a250ee2ff82 /nextstep | |
| parent | 4f0994366d33f8f76db4662cc126720866df3461 (diff) | |
| parent | 84d6f46535554f9f51aae3314313112e8d755c65 (diff) | |
| download | emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.tar.gz emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/Makefile.in
src/keyboard.c
src/termhooks.h
Diffstat (limited to 'nextstep')
| -rw-r--r-- | nextstep/ChangeLog | 4 | ||||
| -rw-r--r-- | nextstep/templates/Info-gnustep.plist.in | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index 909580296e1..d76d832555c 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-06-02 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * templates/Info-gnustep.plist.in: Add NSDocumentClass EmacsDocument. | ||
| 4 | |||
| 1 | 2013-03-16 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2013-03-16 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * Makefile.in (${ns_appdir}): Add touch. | 7 | * Makefile.in (${ns_appdir}): Add touch. |
diff --git a/nextstep/templates/Info-gnustep.plist.in b/nextstep/templates/Info-gnustep.plist.in index 4ac97e5cde6..42abc235761 100644 --- a/nextstep/templates/Info-gnustep.plist.in +++ b/nextstep/templates/Info-gnustep.plist.in | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | NSRole = Application; | 20 | NSRole = Application; |
| 21 | NSTypes = ( | 21 | NSTypes = ( |
| 22 | { | 22 | { |
| 23 | NSDocumentClass = ""; | 23 | NSDocumentClass = "EmacsDocument"; |
| 24 | NSHumanReadableName = ""; | 24 | NSHumanReadableName = ""; |
| 25 | NSIcon = ""; | 25 | NSIcon = ""; |
| 26 | NSName = ""; | 26 | NSName = ""; |
| @@ -30,7 +30,7 @@ | |||
| 30 | ); | 30 | ); |
| 31 | }, | 31 | }, |
| 32 | { | 32 | { |
| 33 | NSDocumentClass = ""; | 33 | NSDocumentClass = "EmacsDocument"; |
| 34 | NSHumanReadableName = ""; | 34 | NSHumanReadableName = ""; |
| 35 | NSIcon = ""; | 35 | NSIcon = ""; |
| 36 | NSName = ""; | 36 | NSName = ""; |
| @@ -41,7 +41,7 @@ | |||
| 41 | ); | 41 | ); |
| 42 | }, | 42 | }, |
| 43 | { | 43 | { |
| 44 | NSDocumentClass = ""; | 44 | NSDocumentClass = "EmacsDocument"; |
| 45 | NSHumanReadableName = ""; | 45 | NSHumanReadableName = ""; |
| 46 | NSIcon = ""; | 46 | NSIcon = ""; |
| 47 | NSName = ""; | 47 | NSName = ""; |
| @@ -51,7 +51,7 @@ | |||
| 51 | ); | 51 | ); |
| 52 | }, | 52 | }, |
| 53 | { | 53 | { |
| 54 | NSDocumentClass = ""; | 54 | NSDocumentClass = "EmacsDocument"; |
| 55 | NSHumanReadableName = ""; | 55 | NSHumanReadableName = ""; |
| 56 | NSIcon = ""; | 56 | NSIcon = ""; |
| 57 | NSName = ""; | 57 | NSName = ""; |
| @@ -64,7 +64,7 @@ | |||
| 64 | ); | 64 | ); |
| 65 | }, | 65 | }, |
| 66 | { | 66 | { |
| 67 | NSDocumentClass = ""; | 67 | NSDocumentClass = "EmacsDocument"; |
| 68 | NSHumanReadableName = ""; | 68 | NSHumanReadableName = ""; |
| 69 | NSIcon = ""; | 69 | NSIcon = ""; |
| 70 | NSName = ""; | 70 | NSName = ""; |
| @@ -74,7 +74,7 @@ | |||
| 74 | ); | 74 | ); |
| 75 | }, | 75 | }, |
| 76 | { | 76 | { |
| 77 | NSDocumentClass = ""; | 77 | NSDocumentClass = "EmacsDocument"; |
| 78 | NSHumanReadableName = ""; | 78 | NSHumanReadableName = ""; |
| 79 | NSIcon = ""; | 79 | NSIcon = ""; |
| 80 | NSName = ""; | 80 | NSName = ""; |
| @@ -84,7 +84,7 @@ | |||
| 84 | ); | 84 | ); |
| 85 | }, | 85 | }, |
| 86 | { | 86 | { |
| 87 | NSDocumentClass = ""; | 87 | NSDocumentClass = "EmacsDocument"; |
| 88 | NSHumanReadableName = ""; | 88 | NSHumanReadableName = ""; |
| 89 | NSIcon = ""; | 89 | NSIcon = ""; |
| 90 | NSName = ""; | 90 | NSName = ""; |