Changed font back from Monaco to Bitstream Vera Sans Mono; osx.patch

1 files changed, 29 insertions, 31 deletions

diff --git a/osx.patch b/osx.patch
index 5d1018c6..21f27fea 100644
--- a/osx.patch
+++ b/osx.patch
@@ -1,6 +1,6 @@
-diff -r 48f2f7ef285f core/events.lua
---- a/core/events.lua	Thu Nov 08 15:01:36 2007 -0500
-+++ b/core/events.lua	Thu Nov 08 16:23:06 2007 -0500
+diff -r 8c3e7e659b6f core/events.lua
+--- a/core/events.lua	Fri Nov 16 19:17:44 2007 -0500
++++ b/core/events.lua	Sat Nov 17 23:19:41 2007 -0500
 @@ -372,11 +372,11 @@ add_handler('quit',
        end
      end
@@ -18,9 +18,9 @@ diff -r 48f2f7ef285f core/events.lua
      end
      textadept.io.save_session()
      return true
-diff -r 48f2f7ef285f core/ext/find.lua
---- a/core/ext/find.lua	Thu Nov 08 15:01:36 2007 -0500
-+++ b/core/ext/find.lua	Thu Nov 08 16:23:06 2007 -0500
+diff -r 8c3e7e659b6f core/ext/find.lua
+--- a/core/ext/find.lua	Fri Nov 16 19:17:44 2007 -0500
++++ b/core/ext/find.lua	Sat Nov 17 23:19:41 2007 -0500
 @@ -96,7 +96,11 @@ function find.replace(rtext)
      function(code)
        local ret, val = pcall( loadstring('return '..code) )
@@ -34,9 +34,9 @@ diff -r 48f2f7ef285f core/ext/find.lua
          error()
        end
        return val
-diff -r 48f2f7ef285f core/file_io.lua
---- a/core/file_io.lua	Thu Nov 08 15:01:36 2007 -0500
-+++ b/core/file_io.lua	Thu Nov 08 16:23:06 2007 -0500
+diff -r 8c3e7e659b6f core/file_io.lua
+--- a/core/file_io.lua	Fri Nov 16 19:17:44 2007 -0500
++++ b/core/file_io.lua	Sat Nov 17 23:19:41 2007 -0500
 @@ -44,11 +44,12 @@ end
  --   specified, the user is prompted to open files from a dialog.
  -- @usage textadept.io.open(filename)
@@ -83,9 +83,9 @@ diff -r 48f2f7ef285f core/file_io.lua
    buffer:delete()
    return true
  end
-diff -r 48f2f7ef285f core/init.lua
---- a/core/init.lua	Thu Nov 08 15:01:36 2007 -0500
-+++ b/core/init.lua	Thu Nov 08 16:23:06 2007 -0500
+diff -r 8c3e7e659b6f core/init.lua
+--- a/core/init.lua	Fri Nov 16 19:17:44 2007 -0500
++++ b/core/init.lua	Sat Nov 17 23:19:41 2007 -0500
 @@ -14,6 +14,23 @@ function textadept.check_focused_buffer(
    end
  end
@@ -110,9 +110,9 @@ diff -r 48f2f7ef285f core/init.lua
  package.path = package.path..';'.._HOME..'/core/?.lua'
  
  require 'iface'
-diff -r 48f2f7ef285f modules/textadept/editing.lua
---- a/modules/textadept/editing.lua	Thu Nov 08 15:01:36 2007 -0500
-+++ b/modules/textadept/editing.lua	Thu Nov 08 16:23:06 2007 -0500
+diff -r 8c3e7e659b6f modules/textadept/editing.lua
+--- a/modules/textadept/editing.lua	Fri Nov 16 19:17:44 2007 -0500
++++ b/modules/textadept/editing.lua	Sat Nov 17 23:19:41 2007 -0500
 @@ -219,9 +219,12 @@ function goto_line(line)
  function goto_line(line)
    local buffer = buffer
@@ -129,9 +129,9 @@ diff -r 48f2f7ef285f modules/textadept/editing.lua
      line = tonumber(line)
    end
    buffer:ensure_visible_enforce_policy(line - 1)
-diff -r 48f2f7ef285f modules/textadept/macros.lua
---- a/modules/textadept/macros.lua	Thu Nov 08 15:01:36 2007 -0500
-+++ b/modules/textadept/macros.lua	Thu Nov 08 16:23:06 2007 -0500
+diff -r 8c3e7e659b6f modules/textadept/macros.lua
+--- a/modules/textadept/macros.lua	Fri Nov 16 19:17:44 2007 -0500
++++ b/modules/textadept/macros.lua	Sat Nov 17 23:19:41 2007 -0500
 @@ -66,9 +66,12 @@ function stop_recording()
    recording = false
    local textadept = textadept
@@ -174,9 +174,9 @@ diff -r 48f2f7ef285f modules/textadept/macros.lua
    end
    local macro = list[macro_name]
    if not macro then return end
-diff -r 48f2f7ef285f src/Makefile
---- a/src/Makefile	Thu Nov 08 15:01:36 2007 -0500
-+++ b/src/Makefile	Thu Nov 08 16:23:06 2007 -0500
+diff -r 8c3e7e659b6f src/Makefile
+--- a/src/Makefile	Fri Nov 16 19:17:44 2007 -0500
++++ b/src/Makefile	Sat Nov 17 23:19:41 2007 -0500
 @@ -2,7 +2,7 @@
  
  .SUFFIXES: .c .o .h .a
@@ -196,9 +196,9 @@ diff -r 48f2f7ef285f src/Makefile
 +	g++ `pkg-config --libs gtk+-2.0 gthread-2.0` -lstdc++ -DGTK -L/opt/local/lib -llua $^ -o $@
  clean:
  	rm -rf textadept *.o
-diff -r 48f2f7ef285f src/properties.h
---- a/src/properties.h	Thu Nov 08 15:01:36 2007 -0500
-+++ b/src/properties.h	Thu Nov 08 16:23:06 2007 -0500
+diff -r 8c3e7e659b6f src/properties.h
+--- a/src/properties.h	Fri Nov 16 19:17:44 2007 -0500
++++ b/src/properties.h	Sat Nov 17 23:19:41 2007 -0500
 @@ -32,7 +32,7 @@ void set_default_editor_properties(Scint
    SS(sci, SCI_SETFOLDFLAGS, 16);
    SS(sci, SCI_SETMODEVENTMASK, SC_MOD_CHANGEFOLD);
@@ -208,9 +208,9 @@ diff -r 48f2f7ef285f src/properties.h
       SS(sci, SCI_TEXTWIDTH, STYLE_LINENUMBER, reinterpret_cast<long>("9")));
  
    SS(sci, SCI_SETMARGINWIDTHN, 1, 0); // marker margin invisible
-diff -r 48f2f7ef285f src/textadept.c
---- a/src/textadept.c	Thu Nov 08 15:01:36 2007 -0500
-+++ b/src/textadept.c	Thu Nov 08 16:23:06 2007 -0500
+diff -r 8c3e7e659b6f src/textadept.c
+--- a/src/textadept.c	Fri Nov 16 19:17:44 2007 -0500
++++ b/src/textadept.c	Sat Nov 17 23:19:41 2007 -0500
 @@ -29,7 +29,7 @@ int main(int argc, char **argv) {
  
  void create_ui() {
@@ -220,13 +220,11 @@ diff -r 48f2f7ef285f src/textadept.c
    signal(window, "delete_event", w_exit);
    signal(window, "focus-in-event", w_focus);
    signal(window, "key_press_event", w_keypress);
-@@ -105,8 +105,8 @@ void new_scintilla_buffer(ScintillaObjec
-   }
+@@ -106,7 +106,7 @@ void new_scintilla_buffer(ScintillaObjec
    // Setup default styling and properties.
    SS(sci, SCI_STYLESETFONT, 32,
--     reinterpret_cast<long>("!Bitstream Vera Sans Mono"));
+      reinterpret_cast<long>("!Bitstream Vera Sans Mono"));
 -  SS(sci, SCI_STYLESETSIZE, 32, 8);
-+     reinterpret_cast<long>("!Monaco"));
 +  SS(sci, SCI_STYLESETSIZE, 32, 11);
    SS(sci, SCI_STYLESETFORE, 32, 0xAA | (0xAA << 8) | (0xAA << 16));
    SS(sci, SCI_STYLESETBACK, 32, 0x33 | (0x33 << 8) | (0x33 << 16));